From 4c4282b1129d02d717cf58a0203359edd14ab803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Mon, 30 Mar 2026 21:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/mapper/DeductionPreserveMapper.xml       | 6 +++++-
 .../service/impl/DeductionPreserveServiceImpl.java        | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml
index 606c9161..96c4066e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml
@@ -9,17 +9,21 @@
             c.PART_CODE AS partCode,
             b.BATCH_NO AS batchNo,
             d.PPS_ID AS ppsId,
+            e.NAME AS ppsName,
             a.QTY AS qty,
             a.TEST_QTY AS testQty,
             a.SCRAP_QTY AS scrapQty,
             a.LOSS_QTY AS lossQty,
             a.MEMO AS memo,
             a.CREATE_TIME AS maintenanceTime,
-            a.CREATE_USER AS maintenance
+            a.CREATE_USER AS maintenance,
+            f.REAL_NAME AS maintenanceName
         FROM MES_DEDUCTION_PRESERVE a
         INNER JOIN MES_WORK_ORDER b ON a.WO_ID = b.ID
         INNER JOIN MES_YIELD_ORDER c ON b.YO_ID = c.ID
         INNER JOIN MES_WORK_PLAN d ON a.WP_ID = d.ID
+        LEFT JOIN BS_PROCESS_SET e ON d.PPS_ID = e.ID
+        LEFT JOIN BLADE_USER f ON a.CREATE_USER = f.ID
         <where>
             a.IS_DELETED = 0
             <if test="query.woCode != null and query.woCode != ''">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java
index 39d45361..830de794 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java
@@ -98,10 +98,10 @@ public class DeductionPreserveServiceImpl extends BaseServiceImpl<DeductionPrese
         this.save(deductionPreserve);
 
         // 更新车间订单
-        workOrder.setLossQty(workOrder.getLossQty()+lossQty);
-        workOrder.setScrapQty(workOrder.getScrapQty()+scrapQty);
-        workOrder.setTestQty(workOrder.getTestQty()+testQty);
-        workOrder.setMakeQty(workOrder.getMakeQty()-lossQty-scrapQty-testQty);
+        workOrder.setLossQty(workOrder.getLossQty() + lossQty);
+        workOrder.setScrapQty(workOrder.getScrapQty() + scrapQty);
+        workOrder.setTestQty(workOrder.getTestQty() + testQty);
+        workOrder.setMakeQty(workOrder.getMakeQty() - lossQty - scrapQty - testQty);
         log.info("车间订单:{}, 扣除测试数量:{}", workOrder.getWoCode(), workOrder.getTestQty());
         return workOrderService.updateById(workOrder);
     }