From cf3482e6a4d40713cc09d107f11092c8db2e245a Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 17:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 842b872..21ad83c 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.add_qty,
pm.unit,
sl.sales_contract_no salesContractNo
from
@@ -83,7 +84,10 @@
IFNULL(
TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
0
- ) AS work_minutes
+ ) AS work_minutes,
+ ppo.add_qty,
+ ppo.scrap_qty,
+ ppo.replenish_qty
FROM
production_product_main ppm
LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id
--
Gitblit v1.9.3