From 256884f9364d1312f09410b20736c0c70aa53bef Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 25 八月 2025 15:58:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 90c6061..0c9424a 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
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cms.mapper.CuttingInventoryMapper">
-
+    <select id="statisticsByCuttingIdAndStatus" resultType="map">
+        SELECT
+            t1.cutting_id as cuttingId,
+            count(*) AS cuttingIdNumber,
+            t1.inventory_status as inventoryStatus,
+            t2.cutting_code AS cuttingCode
+        FROM
+            cms_cutting_inventory t1
+        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