From ec3b3bfe38bbde2aecea411c70e1bc868324d9be Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 23 一月 2026 14:53:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 11cd348..5c64617 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -20,6 +20,7 @@
                p.product_name as productName,
                pm.model as productModelName,
                ppo.quantity,
+               ppo.scrap_qty,
                pm.unit,
                sl.sales_contract_no salesContractNo
         from

--
Gitblit v1.9.3