From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 1b11d4c..5ea73fa 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -21,6 +21,7 @@
         pp.name as process,
         pp.qualified_rate as processQualifiedRate,
         pm.model as productModelName,
+        pm.material_code as materialCode,
         ppo.quantity,
         ppo.scrap_qty,
         (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
@@ -99,6 +100,7 @@
         p.product_name,
         pm.model as product_model_name,
         pm.unit,
+        pm.material_code as materialCode,
         slpa.process,
         ppo.quantity,
         slpa.work_hours,

--
Gitblit v1.9.3