From 56b73ce57147653cfbcfe87a7c28e9792dbb2f72 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 29 四月 2026 15:07:33 +0800
Subject: [PATCH] feat: 流转卡二维码返回工单绑定的工艺工序

---
 src/main/resources/mapper/production/ProductProcessMapper.xml |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index f8ba285..0ab44e7 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -4,31 +4,47 @@
 
     <select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
         SELECT
-        *
+        pp.id,
+        pp.no,
+        pp.remark,
+        pp.salary_quota,
+        pp.is_quality,
+        pp.planner_id,
+        pp.planner_name,
+        pp.update_time,
+        pp.type,
+        p.product_name AS name,
+        pm.model AS productModel
         FROM
-        product_process p
+        product_process pp
+        left join product_model pm ON pm.id = pp.product_model_id
+        left join product p ON p.id = pm.product_id
         <where>
             <if test="productProcessDto.name != null and productProcessDto.name != '' ">
-                AND  p.name LIKE CONCAT('%',#{productProcessDto.name},'%')
+                AND p.product_name LIKE CONCAT('%',#{productProcessDto.name},'%')
             </if>
             <if test="productProcessDto.no != null and productProcessDto.no != '' ">
-                AND  p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
+                AND pp.no LIKE CONCAT('%',#{productProcessDto.no},'%')
+            </if>
+            <if test="productProcessDto.type != null">
+                AND pp.type = #{productProcessDto.type}
             </if>
         </where>
-        order by p.id asc
+        order by pp.id asc
     </select>
 
     <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">
         SELECT
         pp.name AS processName,
-        SUM((ppo.quantity + ppo.scrap_qty) * pp.salary_quota) AS totalInput,
-        SUM(ppo.scrap_qty * pp.salary_quota) AS totalScrap,
-        SUM(ppo.quantity * pp.salary_quota) AS totalOutput
+        SUM(pi.quantity) AS totalInput,
+        SUM(distinct ppo.scrap_qty) AS totalScrap,
+        SUM(distinct (ppo.quantity - ppo.scrap_qty)) AS totalOutput
         FROM
         production_product_output ppo
         INNER JOIN production_product_main ppm ON ppo.product_main_id = ppm.id
         INNER JOIN product_process_route_item ppri ON ppm.product_process_route_item_id = ppri.id
         INNER JOIN product_process pp ON ppri.process_id = pp.id
+        INNER JOIN production_product_input pi ON pi.product_main_id = ppm.id
         <where>
             <if test="startDateTime != null">
                 AND ppo.create_time &gt;= #{startDateTime}

--
Gitblit v1.9.3