From 19f324552d79aed6ec9bbc58c2f0fb9502648194 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 c6df81e..c51a68b 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
@@ -366,20 +366,22 @@
<select id="pageWithLedgerAndConfig" resultType="org.jeecg.modules.tms.entity.vo.StocktakingPoundVo">
SELECT
t.id,
- t.tool_id AS toolId,
- t1.classify_id AS classifyId,
+ t.create_time AS createTime,
t.tool_code AS toolCode,
t2.tool_model AS toolModel,
t2.parama_table_name AS paramaTableName,
- t1.total_count AS totalCount,
- t1.available_count AS availableCount,
+ t.tool_id AS toolId,
t3.position_code AS positionCode,
t3.application_type AS applicationType,
- t2.chinese_name AS chineseName,
+ t3.chinese_name AS chineseName,
t3.supplier_id AS supplierId,
t3.storage_location AS storageLocation,
t3.main_unit AS mainUnit,
-
+ t1.available_count AS availableCount,
+ t1.total_count AS totalCount,
+ t3.warehouse_id AS warehouseId,
+ t4.classify_id AS classifyId,
+ t3.province_city AS provinceCity,
<!-- 鍔ㄦ�佸瓧娈甸�夋嫨锛屼娇鐢ㄨ〃鍒悕锛堥渶纭繚琛ㄥ凡鍏宠仈锛� -->
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
--
Gitblit v1.9.3