From 968ace59bdbb99d33caa16a88bc247afaa3b7c4c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 11:00:02 +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 | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index a122e90..9cb3993 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -16,13 +16,16 @@
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
@@ -68,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