From 48d57d9257ff287e2c2b2e9cef572173a2069c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Wed, 10 Jun 2026 17:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=AE=B0=E5=BD=95=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java | 3 +++
 .../org/springblade/desk/produce/mapper/MacToolUseMapper.xml  | 1 +
 .../org/springblade/desk/produce/mapper/WorkPlanMapper.xml    | 4 ++--
 .../desk/produce/service/impl/PdaLoadServiceImpl.java         | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java
index 13547d143..8aaa5dc30 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java
@@ -48,4 +48,7 @@ public class MesMacToolUseVO {
 	@Schema(description = "绑定人员")
 	private String name;
 
+	@Schema(description = "挂次号")
+	private String hangNum;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
index 63c3cbb31..e9cf85bda 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
@@ -208,6 +208,7 @@
     <select id="getMacToolUseByWpId" resultType="org.springblade.desk.produce.pojo.vo.MesMacToolUseVO">
         SELECT
         a.ID AS id,
+        a.HANG_NUM AS hangNum,
         a.MTN_CODE  AS code,
         c.wo_code   AS woCode,
         c.PART_CODE AS partCode,
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
index df05068a4..93aca0a02 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
@@ -51,7 +51,7 @@
         <result column="CREATE_MAN" property="createMan"/>
     </resultMap>
     <update id="updateWorkPlan">
-        update mes_work_plan set QUALIFIED_QTY = QUALIFIED_QTY + #{num},a.work_qty = a.work_qty + #{num}
+        update mes_work_plan set QUALIFIED_QTY = QUALIFIED_QTY + #{num},work_qty = work_qty + #{num}
         where wo_id = #{woId} and status > 2 and is_deleted = 0
     </update>
     <update id="updateMakeRec">
@@ -59,7 +59,7 @@
         where wp_id in (select a.ID from MES_WORK_PLAN a where a.WO_ID = #{woId}) and is_deleted = 0
     </update>
     <update id="updateInspection">
-        update QA_INSPECTION_TASK set QUALIFIED_QTY = qualified_qty + #{num}
+        update QA_INSPECTION_TASK set QUALIFIED_QTY = QUALIFIED_QTY + #{num}
         where wp_id in (select a.ID from MES_WORK_PLAN a where a.WO_ID = #{woId}) and is_deleted = 0
     </update>
     <update id="updatePlateAround">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
index 859a78fef..687086d0c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
@@ -618,9 +618,8 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         }
         // 修改数量
         if (mesDataMaintainLog.getQtyAfter() != null) {
-            yieldOrder.setYpQty(mesDataMaintainLog.getQtyAfter());
             // 修改车间订单数量
-            WorkOrder workOrder = workOrderService.getWorkOrderByCardNo(yieldOrder.getCardNo());
+            WorkOrder workOrder = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getCardNo, yieldOrder.getCardNo())).get(0);
             if (workOrder != null) {
 //                WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
 //                try {
@@ -630,6 +629,7 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 //                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
 //                }
                 double num = mesDataMaintainLog.getQtyAfter() - yieldOrder.getYpQty();
+                yieldOrder.setYpQty(mesDataMaintainLog.getQtyAfter());
                 workOrderService.update(Wrappers.lambdaUpdate(WorkOrder.class).eq(WorkOrder::getId, workOrder.getId()).set(WorkOrder::getMakeQty, workOrder.getMakeQty() + num));
                 // 修改作业计划接收数量、报工数量
                 baseMapper.updateWorkPlan(num, workOrder.getId());