From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsStocktakingBoundDetailMapper.xml | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsStocktakingBoundDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsStocktakingBoundDetailMapper.xml
index 214d4dd..fb9d1de 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsStocktakingBoundDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsStocktakingBoundDetailMapper.xml
@@ -17,12 +17,12 @@
<select id="selectByMainId" resultType="org.jeecg.modules.tms.entity.ToolsStocktakingBoundDetail">
SELECT
t.*,
- t2.tool_code AS toolCode, <!-- 淇锛氬皢t1鏀逛负t2 -->
t2.parama_table_name paramaTableName,
- t2.classify_id AS classifyId,
+ t4.classify_id AS classifyId,
t3.storage_location AS storageLocation,
t3.chinese_name AS chineseName,
t2.tool_model AS toolModel,
+ t3.application_type AS applicationType,
t3.supplier_id AS supplierId,
<choose>
@@ -56,9 +56,14 @@
c.part_material AS partMaterial
</otherwise>
</choose>
+
FROM tms_stocktaking_bound_detail t
- LEFT JOIN tms_base_tools t2 on t.tool_id = t2.id
- LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
+ left join tms_tool_ledger t1 ON t1.tool_id= t.tool_Code
+ left join tms_tool_ledger_detail t5 ON t5.tool_Code= t.tool_id
+ 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
+
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
@@ -88,4 +93,30 @@
${ew.customSqlSegment}
</select>
+
+ <select id="toolsStocktakingList" resultType="map" parameterType="String">
+ SELECT
+ t1.id,
+ t1.tool_id onlyCode,
+ t1.book_quantity bookQuantity,
+ t1.available_quantity availableQuantity,
+ t1.practical_quantity practicalQuantity,
+ t1.surplus_deficit surplusDeficit,
+ t1.stocktaking_date stocktakingDate,
+ t2.order_code orderCode,
+ t2.stocktaking_type stocktakingType,
+ t2.stocktaking_name stocktakingName,
+ t3.tool_code toolCode,
+ t3.chinese_name chineseName,
+ t3.tool_model toolModel,
+ t4.classify_id classifyNum,
+ t5.item_text handler
+ FROM
+ tms_stocktaking_bound_detail t1
+ LEFT JOIN tms_stocktaking_bound t2 ON t2.id = t1.stocktaking_bound_id
+ LEFT JOIN tms_base_tools t3 ON t3.id = t1.tool_code
+ LEFT JOIN tms_tools_classify t4 ON t4.id = t3.classify_id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'sys_user' ) t5 ON t5.item_value = t2.handler
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3