From 80348cce3548ba23023f584c471cb176ce015af5 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 09:40:17 +0800
Subject: [PATCH] 工具报损/刀具刃磨 修改

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsSharpeningMapper.xml |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsSharpeningMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsSharpeningMapper.xml
index db23bc1..858f8cb 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsSharpeningMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsSharpeningMapper.xml
@@ -2,26 +2,29 @@
 <!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.ToolsSharpeningMapper">
     <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.vo.ToolSharpeningVo">
-        SELECT
-            t.*,
-            t1.classify_id AS classifyId,
-            t1.parama_table_name AS paramaTableName,
-            t2.type_name AS typeName,
-            t3.application_type AS applicationType,
-            t3.tool_model AS toolModel,
-            t3.province_city AS provinceCity,
-            t3.chinese_name AS chineseName,
-            t3.supplier_id AS supplierId,
-            t3.storage_location AS storageLocation,
-            t3.main_unit AS mainUnit,
-            t4.position_code AS positionCode,
-            t4.warehouse_id AS warehouseId
+
+
+        SELECT t.*,
+               t2.tool_model        AS toolModel,
+               t2.parama_table_name AS paramaTableName,
+               t.tool_id            AS toolId,
+               t3.position_code     AS positionCode,
+               t3.application_type  AS applicationType,
+               t3.chinese_name      AS chineseName,
+               t3.supplier_id       AS supplierId,
+               t3.storage_location  AS storageLocation,
+               t3.main_unit         AS mainUnit,
+               t3.warehouse_id      AS warehouseId,
+               t4.classify_id       AS classifyId,
+               t3.province_city     AS provinceCity
         FROM tms_tool_sharpening t
-                 LEFT JOIN tms_base_tools t1 ON t1.id = t.tool_code
-                 LEFT JOIN tms_tools_classify t2 ON t1.classify_id = t2.id
-                 LEFT JOIN tms_tools_config_property t3 ON t3.tool_code = t.tool_id
-                 LEFT JOIN tms_tool_ledger_detail t4 ON t4.tool_code = t.tool_id
-        ${ew.customSqlSegment}
+
+                 left join tms_tool_ledger t1 ON t1.tool_id = t.tool_Code
+                 left join tms_tool_ledger_detail t5 ON t5.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
+            ${ew.customSqlSegment}
     </select>
 
     <select id="toolSharpeningList" resultType="map" parameterType="String">

--
Gitblit v1.9.3