From 123b81e8a7d6b78fc4b0729f5fd6b32a876cf740 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 10 六月 2025 10:55:36 +0800
Subject: [PATCH] 工具管理-刀具准备单代码生成
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 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 4e099e2..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
@@ -71,6 +71,7 @@
<select id="paraCommonToolList" resultType="org.jeecg.modules.tms.entity.vo.ParaCommonToolVo">
select
t.id,
+ t.id toolCodeId,
t.classify_id classifyId,
t.tool_code toolCode,
t.sign_code signCode,
@@ -359,19 +360,16 @@
<select id="pageWithLedgerAndConfig" resultType="org.jeecg.modules.tms.entity.vo.StocktakingPoundVo">
SELECT
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,
- t4.position_code AS positionCode,
+ 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,
@@ -408,11 +406,12 @@
c.part_material AS partMaterial
</otherwise>
</choose>
+ 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
- LEFT JOIN tms_tool_ledger_detail t4 ON t4.tool_code = t.id
<!-- 鍔ㄦ�佽〃鍏宠仈锛岀‘淇濇墍鏈夋儏鍐甸兘鏈夊搴旂殑 LEFT JOIN -->
<choose>
@@ -441,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>
@@ -453,33 +452,33 @@
<select id="pageWithSharpedAndConfig" resultType="org.jeecg.modules.tms.entity.vo.SharpeeningVo">
SELECT
t.id,
- t.classify_id AS classifyId,
+ t.create_time AS createTime,
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,
- t4.position_code AS positionCode,
+ 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,
- t4.warehouse_id AS warehouseId,
+ t3.warehouse_id AS warehouseId,
+ t4.classify_id AS classifyId,
t3.province_city AS provinceCity
+ 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
- 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
- LEFT JOIN tms_tool_ledger_detail t4 ON t4.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