From 3e144b2eb8fc9447d2d092edb71db533d12abc52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 24 九月 2026 19:06:39 +0800
Subject: [PATCH] feat(生产核算): 新增大类「中提琴」并打通工资/核算折算

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

diff --git a/src/main/resources/mapper/production/ProductionCostingMapper.xml b/src/main/resources/mapper/production/ProductionCostingMapper.xml
index 05e3d7a..9985307 100644
--- a/src/main/resources/mapper/production/ProductionCostingMapper.xml
+++ b/src/main/resources/mapper/production/ProductionCostingMapper.xml
@@ -11,6 +11,7 @@
             too.name                                 as processName,
             cp.dept_type                             as deptType,
             ppo.product_model_id                     as productModelId,
+            ppm.major_category                       as majorCategory,
             p.product_name                           as productName,
             pm.model                                 as modelName,
             sum(ifnull(ppo.quantity, 0))             as quantity
@@ -40,7 +41,7 @@
                 </if>
             </if>
         </where>
-        group by ppm.user_id, ppm.user_name, yearMonth, too.id, too.name, cp.dept_type, ppo.product_model_id, p.product_name, pm.model
+        group by ppm.user_id, ppm.user_name, yearMonth, too.id, too.name, cp.dept_type, ppo.product_model_id, ppm.major_category, p.product_name, pm.model
         order by yearMonth desc, ppm.user_id, too.id
     </select>
 

--
Gitblit v1.9.3