From 978c3b3b1f3b15e46fb4078f4aeb04e6d366f127 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 13:55:57 +0800
Subject: [PATCH] 返回合格数量

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index a122e90..875c2a1 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -22,6 +22,7 @@
         pm.model as productModelName,
         ppo.quantity,
         ppo.scrap_qty,
+        ppo.other_data,
         pm.unit,
         sl.sales_contract_no salesContractNo
         from
@@ -52,6 +53,34 @@
         order by ppm.id
 
     </select>
+    <select id="getByProductWorkOrderId" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
+        select ppm.*,
+        pwo.work_order_no as workOrderNo,
+        pwo.status as workOrderStatus,
+        u.nick_name as nickName,
+        p.product_name as productName,
+        pp.name as process,
+        pm.model as productModelName,
+        ppo.quantity,
+        ppo.scrap_qty,
+        ppo.other_data,
+        (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
+        pm.unit
+        from
+        production_product_main ppm
+        left join product_work_order pwo on pwo.id = ppm.work_order_id
+        left join product_process_route_item ppri on ppri.id = pwo.product_process_route_item_id
+        left join product_process pp on pp.id = ppri.process_id
+        left join product_order po on po.id = pwo.product_order_id
+        left join production_product_output ppo on ppm.id = ppo.product_main_id
+        left join product_model pm on pm.id = ppo.product_model_id
+        left join product p on p.id = pm.product_id
+        left join sales_ledger sl on sl.id = po.sales_ledger_id
+        left join sys_user u on u.user_id = ppm.user_id
+        where pwo.id = #{productWorkOrderId}
+        order by ppm.id
+    </select>
+
     <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
         select po.*
         from product_order po

--
Gitblit v1.9.3