From 92bc6dca274eb45dc330f63b5a3f90a01458e157 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 27 五月 2025 14:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 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
new file mode 100644
index 0000000..49ef0c6
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.InboundDetailMapper">
+
+    <select id="findPageList" resultType="map" parameterType="String">
+        select
+            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,
+            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