From 3a959bff4721bfdbe60c1e7c5ba3c9851ac0d3f8 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 25 三月 2026 15:15:45 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 9c3bf3d..e4ac324 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

--
Gitblit v1.9.3