From c3ef5e22767d76a181ac224d919fe436405210d2 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 28 五月 2025 10:49:18 +0800
Subject: [PATCH] 工具选择修改查询sql
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml | 13 ++++++++-----
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/SharpeeningVo.java | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/SharpeeningVo.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/SharpeeningVo.java
index aa9d7d8..fa17a56 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/SharpeeningVo.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/SharpeeningVo.java
@@ -23,6 +23,7 @@
@Dict(dicCode = "tool_para_type")
private String paramaTableName;
private Integer totalCount;
+
@Dict(dicCode = "application_type")
private String applicationType;
private String chineseName;
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..549472b 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
@@ -358,6 +358,7 @@
<select id="pageWithLedgerAndConfig" resultType="org.jeecg.modules.tms.entity.vo.StocktakingPoundVo">
SELECT
+ DISTINCT
t.id,
t.classify_id AS classifyId,
t.tool_code AS toolCode,
@@ -369,7 +370,7 @@
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,
@@ -412,7 +413,7 @@
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>
@@ -452,7 +453,9 @@
<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,
@@ -463,19 +466,19 @@
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,
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
- LEFT JOIN tms_tool_ledger_detail t4 ON t4.tool_code = t.id
+
<where>
<if test="ew.paramNameValuePairs.toolCode != null and ew.paramNameValuePairs.toolCode != ''">
--
Gitblit v1.9.3