From 5836788a6aabf60014a746b724607e3e965a0d86 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsLossBoundDetailMapper.xml | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsLossBoundDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsLossBoundDetailMapper.xml
index 40abda6..fd5564d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsLossBoundDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsLossBoundDetailMapper.xml
@@ -15,46 +15,60 @@
</select>
<select id="queryPageList" resultType="org.jeecg.modules.tms.entity.ToolsLossBoundDetail">
SELECT
- t1.*,
- t2.chinese_name chineseName,
- t2.tool_model toolModel,
- t2.classify_id classifyId,
- t2.parama_table_name paramaTableName,
- t3.application_type applicationType,
- t3.supplier_id supplierId,
+ t.*,
+ t1.classify_id AS classifyId,
+ t2.tool_model AS toolModel,
+ t2.parama_table_name AS paramaTableName,
+ t3.position_code AS positionCode,
+ t3.application_type AS applicationType,
+ t2.chinese_name AS chineseName,
+ t3.supplier_id AS supplierId,
+ t3.storage_location AS storageLocation,
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
- t4.tool_material toolMaterial,
- t4.part_material partMaterial
- </when>
- <when test="ew.paramNameValuePairs.paramaTableName == '2'">
t5.tool_material toolMaterial,
t5.part_material partMaterial
</when>
- <when test="ew.paramNameValuePairs.paramaTableName == '3'">
+ <when test="ew.paramNameValuePairs.paramaTableName == '2'">
t6.tool_material toolMaterial,
t6.part_material partMaterial
</when>
- <when test="ew.paramNameValuePairs.paramaTableName == '4'">
+ <when test="ew.paramNameValuePairs.paramaTableName == '3'">
t7.tool_material toolMaterial,
t7.part_material partMaterial
</when>
- <when test="ew.paramNameValuePairs.paramaTableName == '5'">
+ <when test="ew.paramNameValuePairs.paramaTableName == '4'">
t8.tool_material toolMaterial,
t8.part_material partMaterial
</when>
- <when test="ew.paramNameValuePairs.paramaTableName == '6'">
+ <when test="ew.paramNameValuePairs.paramaTableName == '5'">
t9.tool_material toolMaterial,
t9.part_material partMaterial
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '6'">
+ t10.tool_material toolMaterial,
+ t10.part_material partMaterial
</when>
<otherwise>
t10.tool_material toolMaterial,
t10.part_material partMaterial
</otherwise>
</choose>
- FROM tms_loss_bound_detail t1
- LEFT JOIN tms_base_tools t2 on t1.tool_id = t2.id
- LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
+ FROM tms_loss_bound_detail t
+ left join tms_tool_ledger t1 ON t1.tool_id= t.tool_Code
+ left join tms_tools_classify t4 on t4.id = t1.classify_id
+ left join tms_base_tools t2 on t2.id = t.tool_code
+ left join tms_tools_config_property t3 on t3.tool_code = t.tool_code
+
+
+-- LEFT JOIN tms_base_tools t2 on t1.tool_id = t2.id
+-- LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
+
+
+
+
+
+
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
@@ -81,4 +95,28 @@
</choose>
${ew.customSqlSegment}
</select>
+
+
+ <select id="toolLossDetailList" resultType="map" parameterType="String">
+ SELECT
+ t1.id,
+ t1.tool_id onlyCode,
+ t1.loss_number lossNumber,
+ t1.loss_reason lossReason,
+ t2.order_code orderCode,
+ t2.loss_time lossTime,
+ t3.id toolCodeId,
+ t3.tool_code toolCode,
+ t3.chinese_name chineseName,
+ t3.tool_model toolModel,
+ t4.classify_id classifyNum,
+ t5.item_text handler
+ FROM
+ tms_loss_bound_detail t1
+ LEFT JOIN tms_loss_bound t2 ON t2.id = t1.loss_bound_id
+ LEFT JOIN tms_base_tools t3 ON t3.id = t1.tool_code
+ LEFT JOIN tms_tools_classify t4 ON t4.id = t3.classify_id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'sys_user' ) t5 ON t5.item_value = t2.handler
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3