From 1ae9b57657199f46affc9083c39681f1ec934e3f Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 26 五月 2025 17:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 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..49ef0c6 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
@@ -7,15 +7,18 @@
             t1.id,
             t3.id toolCodeId,
             t1.in_storage_quantity inStorageQuantity,
+            t1.in_actual_count inActualCount,
             t3.tool_code toolCode,
             t3.chinese_name chineseName,
             t3.tool_model toolModel,
-            t5.item_text applicationType
+            t5.item_text applicationType,
+            t6.classify_id classifyNum
             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
             ${ew.customSqlSegment}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3