From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序，还要根据工艺路线的工序的顺序进行排序，开始的排在前面

---
 src/main/resources/mapper/production/ProductionProductOutputMapper.xml |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index 48c8c9e..fad5b62 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -9,7 +9,9 @@
         <result property="quantity" column="quantity"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="createTime" column="create_time"/>
+        <result property="otherData" column="other_data"/>
     </resultMap>
+
     <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
         select ppo.*,
         pm.model as model,
@@ -25,4 +27,36 @@
         </where>
         order by ppo.id
     </select>
+
+    <delete id="deleteByProductMainIds" parameterType="java.util.List">
+        DELETE FROM production_product_output
+        WHERE product_main_id IN
+        <foreach collection="productMainIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <select id="selectOutputStats" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
+        SELECT
+            create_time,
+            quantity,
+            scrap_qty
+        FROM
+            production_product_output
+        WHERE
+            create_time &gt;= #{startDate}
+            AND create_time &lt;= #{endDate}
+    </select>
+
+    <select id="selectDailyOutputStats" resultType="java.util.Map">
+        SELECT
+            DATE_FORMAT(create_time, '%Y-%m-%d') as date,
+            SUM(quantity-scrap_qty) as quantity
+        FROM
+            production_product_output
+        WHERE
+            create_time &gt;= #{startDate}
+            AND create_time &lt;= #{endDate}
+        GROUP BY
+            DATE_FORMAT(create_time, '%Y-%m-%d')
+    </select>
 </mapper>

--
Gitblit v1.9.3