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/InboundDetailMapper.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml
index 4ef950a..5b638ab 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml
@@ -5,17 +5,27 @@
<select id="findPageList" resultType="map" parameterType="String">
select
t1.id,
+ t1.create_by createBy,
+ t1.create_time createTime,
+ t2.inbound_num inboundNum,
t3.id toolCodeId,
t1.in_storage_quantity inStorageQuantity,
+ t1.in_actual_count inActualCount,
t3.tool_code toolCode,
+ t1.tool_id onlyCode,
t3.chinese_name chineseName,
t3.tool_model toolModel,
- t5.item_text applicationType
- from tms_inbound_detail t1
- left join tms_inbound_order t2 on t1.in_storehouse_id = t2.id
- left join tms_base_tools t3 on t3.id = t1.tool_code
- left join tms_tools_config_property t4 on t4.tool_code = t1.tool_code
- left join (select * from v_sys_dict where dict_code = 'application_type') t5 on t5.item_value = t4.application_type
+ t5.item_text applicationType,
+ t6.id classifyId,
+ t6.classify_id classifyNum,
+ t8.item_text inStorehouseType
+ from tms_inbound_detail t1
+ left join tms_inbound_order t2 on t1.in_storehouse_id = t2.id
+ left join tms_base_tools t3 on t3.id = t1.tool_code
+ left join tms_tools_config_property t4 on t4.tool_code = t1.tool_code
+ left join (select * from v_sys_dict where dict_code = 'application_type') t5 on t5.item_value = t4.application_type
+ left join tms_tools_classify t6 on t6.id = t3.classify_id
+ LEFT JOIN (select * from v_sys_dict where dict_code='in_storehouse_type') t8 on t8.item_value = t2.in_storehouse_type
${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3