From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml
index 79cf799..18e7b39 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml
@@ -2,12 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.InStoreDetailMapper">
- <select id="queryPageList" resultType="map" parameterType="String">
+ <select id="findPageList" resultType="map" parameterType="String">
SELECT
t.id,
t.tool_id onlyCode,
t.in_storehouse_type inStorehouseType,
- t.goods_shelves_id goodsShelvesId,
+ t10.location_code locationCode,
t.in_number inNumber,
t.in_storehouse_id inStorehouseId,
t.inbound_time inboundTime,
@@ -26,8 +26,9 @@
t4.item_text operateType,
t5.realname handler,
t6.realname reviewer,
- t7.item_value inStatus,
- t8.item_value orderStatus
+ t7.item_text inStatus,
+ t8.item_text orderStatus,
+ t9.item_text inStorehouseTypeName
FROM tms_in_store_detail t
LEFT JOIN tms_base_tools t1 on t.tool_code = t1.id
LEFT JOIN tms_tools_classify t2 on t2.id = t1.classify_id
@@ -37,6 +38,8 @@
LEFT JOIN sys_user t6 on t6.username = t3.reviewer
LEFT JOIN (select * from v_sys_dict where dict_code='in_status') t7 on t7.item_value = t3.in_status
LEFT JOIN (select * from v_sys_dict where dict_code='in_bill_status') t8 on t8.item_value = t3.order_status
+ left join (select * from v_sys_dict where dict_code='in_storehouse_type') t9 on t9.item_value = t.in_storehouse_type
+ left join tms_goods_shelves t10 on t10.id = t.goods_shelves_id
${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3