From 17a63200983a8e154a1eb3549d1caffa050372c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 17:14:45 +0800
Subject: [PATCH] feat:1.生产订单领用 2.报工领用(关联订单领用) 3.报工删除(关联报工领用) 4.不合格处理(返工生成返工附件并下载)

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 9c3bf3d..9cb3993 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -16,16 +16,22 @@
         select ppm.*,
         pwo.work_order_no as workOrderNo,
         pwo.status as workOrderStatus,
+        pwo.total_investment as totalInvestment,
         u.nick_name as nickName,
         p.product_name as productName,
+        pp.name as process,
+        pp.id as processId,
         pm.model as productModelName,
         ppo.quantity,
         ppo.scrap_qty,
         pm.unit,
+        pm.uid_no,
         sl.sales_contract_no salesContractNo
         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
@@ -65,6 +71,7 @@
         p.product_name,
         pm.model as product_model_name,
         pm.unit,
+        pm.uid_no,
         slpa.process,
         ppo.quantity,
         slpa.work_hours,

--
Gitblit v1.9.3