From ca511301d30594decf86b1a53eed3bbfc0b60ead Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 03 六月 2025 17:11:01 +0800
Subject: [PATCH] 工具管理-工具出库流水查询、导出接口调整
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
index 4956f45..1233eaf 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
@@ -5,18 +5,27 @@
<select id="queryPageList" resultType="org.jeecg.modules.tms.entity.vo.OutStoreDetailVo">
SELECT
t1.id,
- t1.tool_code toolCode,
+ t2.tool_code toolCode,
t1.tool_id toolId,
t1.out_storehouse_type outStorehouseType,
t1.goods_shelves_code goodsShelvesCode,
t1.out_number outNumber,
t1.out_storehouse_id outStorehouseId,
- t1.operate_type operateType,
+ case t1.operate_type
+ when '1' then '鐢宠鍗�'
+ when '2' then '鎵嬪伐鎿嶄綔'
+ else ''
+ end operateType,
t1.create_by createBy,
t1.create_time createTime,
t2.chinese_name chineseName,
t2.tool_model toolModel,
t2.parama_table_name paramaTableName,
+ case t3.application_type
+ when '1' then '閫氱敤宸ュ叿'
+ when '2' then '涓撶敤宸ュ叿'
+ else ''
+ end applicationType,
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
t4.tool_material toolMaterial,
@@ -49,8 +58,7 @@
</choose>
FROM tms_out_store_detail t1
LEFT JOIN tms_base_tools t2 on t1.tool_code = t2.id
- LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
- LEFT JOIN tms_tools_classify t11 on t11.id = t2.classify_id
+ LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t1.tool_code
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
LEFT JOIN tms_para_common_tool t4 on t4.tool_code = t2.id
--
Gitblit v1.9.3