From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml
index 0c9424a..d19863b 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml
@@ -6,10 +6,13 @@
t1.cutting_id as cuttingId,
count(*) AS cuttingIdNumber,
t1.inventory_status as inventoryStatus,
- t2.cutting_code AS cuttingCode
+ t2.cutting_code AS cuttingCode,
+ SUM(SUM(CASE WHEN t1.inventory_status = '姝ｅ父' THEN 1 ELSE 0 END)) OVER() AS normalTotal,
+ SUM(SUM(CASE WHEN t1.inventory_status = '宸插嚭搴�' THEN 1 ELSE 0 END)) OVER() AS outboundTotal,
+ SUM(count(*)) OVER() AS totalNumber
FROM
cms_cutting_inventory t1
- LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id AND t2.del_flag = 0
+ LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id AND t2.del_flag = 0
GROUP BY cutting_id, inventory_status, cutting_code
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3