From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/resources/mapper/production/ProductionOperationTaskMapper.xml |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
index 577bcfd..519cbe2 100644
--- a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -29,6 +29,7 @@
                pm.model as model,
                pm.unit as unit,
                poro.operation_name as operationName,
+               poro.type as type,
                IFNULL(scrapStat.scrapQty, 0) AS scrapQty,
         ROUND(IFNULL(pot.complete_quantity, 0) / NULLIF(pot.plan_quantity, 0) * 100, 2) AS completionStatus,
         CASE
@@ -63,11 +64,14 @@
             <if test="c != null and c.status != null">
                 and pot.status = #{c.status}
             </if>
+            <if test="c != null and c.isProduction != null">
+                and poro.is_production = #{c.isProduction}
+            </if>
             <if test="c != null and c.workOrderNo != null and c.workOrderNo != ''">
                 and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
             </if>
         </where>
-        order by pot.id desc
+        order by pot.production_order_id desc, poro.drag_sort
     </select>
 
     <select id="selectTaskStatisticsByDate" resultType="com.ruoyi.home.dto.ProductionTaskStatisticsDto">
@@ -106,7 +110,7 @@
         select poro.operation_name as processName,
                sum(ifnull(ppi.input_quantity, 0)) as totalInput,
                sum(ifnull(ppo.scrap_qty, 0)) as totalScrap,
-               sum(ifnull(ppo.quantity, 0) - ifnull(ppo.scrap_qty, 0)) as totalOutput
+               sum(greatest(ifnull(ppo.quantity, 0) - ifnull(ppo.scrap_qty, 0), 0)) as totalOutput
         from production_product_output ppo
                  inner join production_product_main ppm on ppo.production_product_main_id = ppm.id
                  inner join production_operation_task pot on ppm.production_operation_task_id = pot.id
@@ -119,9 +123,9 @@
             <if test="endDateTime != null">
                 and ppo.create_time &lt;= #{endDateTime}
             </if>
-            <if test="userId != null">
-                and ppm.create_user = #{userId}
-            </if>
+<!--            <if test="userId != null">-->
+<!--                and ppm.create_user = #{userId}-->
+<!--            </if>-->
             <if test="processIds != null and processIds.size() > 0">
                 and poro.technology_operation_id in
                 <foreach collection="processIds" item="id" open="(" separator="," close=")">
@@ -158,6 +162,7 @@
 
     <select id="getOperation" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
         select poro.operation_name as operationName,
+               max(poro.type) as type,
                count(pot.id) as productionTaskCount,
                sum(ifnull(pot.plan_quantity, 0)) as planQuantity,
                sum(ifnull(pot.complete_quantity, 0)) as completeQuantity,

--
Gitblit v1.9.3