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/BaseToolsMapper.xml | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml
index b629b67..5b34e8c 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml
@@ -359,21 +359,17 @@
<select id="pageWithLedgerAndConfig" resultType="org.jeecg.modules.tms.entity.vo.StocktakingPoundVo">
SELECT
- DISTINCT
t.id,
- t.classify_id AS classifyId,
+ t.tool_id AS toolId,
+ t1.classify_id AS classifyId,
t.tool_code AS toolCode,
- t.foreign_language_name AS foreignLanguageName,
- t.standard_level AS standardLevel,
- t.standard_code AS standardCode,
- t.tool_model AS toolModel,
- t.parama_table_name AS paramaTableName,
- t.tool_id AS toolId,
+ t2.tool_model AS toolModel,
+ t2.parama_table_name AS paramaTableName,
t1.total_count AS totalCount,
t1.available_count AS availableCount,
t3.position_code AS positionCode,
t3.application_type AS applicationType,
- t3.chinese_name AS chineseName,
+ t2.chinese_name AS chineseName,
t3.supplier_id AS supplierId,
t3.storage_location AS storageLocation,
t3.main_unit AS mainUnit,
@@ -410,10 +406,11 @@
c.part_material AS partMaterial
</otherwise>
</choose>
-
- FROM tms_base_tools t
- LEFT JOIN tms_tool_ledger t1 ON t1.tool_id = t.id
- LEFT JOIN tms_tools_config_property t3 ON t3.tool_code = t.id
+ FROM tms_tool_ledger_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 -->
@@ -443,8 +440,8 @@
</choose>
<where>
- <if test="ew.paramNameValuePairs.toolCode != null and ew.paramNameValuePairs.toolCode != ''">
- AND t.tool_code LIKE CONCAT('%', #{ew.paramNameValuePairs.toolCode}, '%')
+ <if test="ew.paramNameValuePairs.toolId != null and ew.paramNameValuePairs.toolId != ''">
+ AND t.tool_id LIKE CONCAT('%', #{ew.paramNameValuePairs.toolId}, '%')
</if>
</where>
@@ -454,19 +451,12 @@
<select id="pageWithSharpedAndConfig" resultType="org.jeecg.modules.tms.entity.vo.SharpeeningVo">
SELECT
- DISTINCT
t.id,
t.create_time AS createTime,
- t.classify_id AS classifyId,
t.tool_code AS toolCode,
- t.foreign_language_name AS foreignLanguageName,
- t.standard_level AS standardLevel,
- t.standard_code AS standardCode,
- t.tool_model AS toolModel,
- t.parama_table_name AS paramaTableName,
+ t2.tool_model AS toolModel,
+ t2.parama_table_name AS paramaTableName,
t.tool_id AS toolId,
- t1.total_count AS totalCount,
- t1.available_count AS availableCount,
t3.position_code AS positionCode,
t3.application_type AS applicationType,
t3.chinese_name AS chineseName,
@@ -474,16 +464,21 @@
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_base_tools t
- LEFT JOIN tms_tool_ledger t1 ON t1.tool_id = t.id
- LEFT JOIN tms_tools_config_property t3 ON t3.tool_code = t.id
+ FROM tms_tool_ledger_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
+-- FROM tms_base_tools t
+-- LEFT JOIN tms_tool_ledger t1 ON t1.tool_id = t.id
+-- LEFT JOIN tms_tools_config_property t3 ON t3.tool_code = t.id
<where>
- <if test="ew.paramNameValuePairs.toolCode != null and ew.paramNameValuePairs.toolCode != ''">
- AND t.tool_code LIKE CONCAT('%', #{ew.paramNameValuePairs.toolCode}, '%')
+ <if test="ew.paramNameValuePairs.toolId != null and ew.paramNameValuePairs.toolId != ''">
+ AND t.tool_id LIKE CONCAT('%', #{ew.paramNameValuePairs.toolId}, '%')
</if>
</where>
--
Gitblit v1.9.3