From f2c7c2aca847fda1b96387938a9dcd511daf1461 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 14:18:27 +0800
Subject: [PATCH] feat(production): 新增生产上机记录功能并优化报工流程

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 58559f7..5664e4a 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -31,7 +31,8 @@
         WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
         ELSE '姝ｅ父'
         END AS work_order_type,
-        pp.device_name
+        pp.device_name,
+        pp.user_ids as process_user_ids
         FROM
         product_work_order pwo
         LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -49,6 +50,7 @@
             <if test="c.productOrderId != null and c.productOrderId != ''">
                and pwo.product_order_id = #{c.productOrderId}
             </if>
+        order by po.id desc,pwo.id asc
     </select>
     <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
         SELECT
@@ -60,8 +62,8 @@
             po.nps_no AS productOrderNpsNo,
             ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
             sum(ppo.scrap_qty) scrapQty,
-            ppm.device_id,
-            ppm.device_name
+            pp.device_id,
+            pp.device_name
         FROM
             product_work_order pwo
                 LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -73,8 +75,8 @@
                 LEFT JOIN product p ON p.id = pm.product_id
         WHERE pwo.id = #{id}
         GROUP BY pwo.id, pwo.product_process_route_item_id, pwo.create_time, pwo.update_time, pwo.work_order_no, pwo.plan_start_time, pwo.plan_end_time, pwo.actual_start_time, pwo.actual_end_time, pwo.status, pwo.tenant_id, pwo.plan_quantity, pwo.product_order_id, pwo.complete_quantity,
-                 ppm.device_id,
-                 ppm.device_name,
+                 pp.device_id,
+                 pp.device_name,
                  pp.NAME ,
                  pm.model,
                  pm.unit,
@@ -92,12 +94,9 @@
             actual_start_time &gt;= #{startDate}
             AND actual_start_time &lt;= #{endDate}
     </select>
-    <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
-        SELECT SUBSTRING(work_order_no, 3) as work_order_no
+    <select id="selectMax" resultType="java.lang.Integer">
+        SELECT count(1)
         FROM product_work_order
-        WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
-        order by work_order_no  desc
-        limit 1
-        ;
+        WHERE SUBSTRING(work_order_no, 3) like concat('%',#{datePrefix},'%')
     </select>
 </mapper>

--
Gitblit v1.9.3