From cccb0ca8e5328d4cb09643caca342c0c59518058 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 16:16:42 +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

---
 .../erpdata/feign/IErpDataProduceClient.java         |  2 ++
 .../produce/service/impl/PdaLoadServiceImpl.java     | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java
index 989355dd9..0848e2ad1 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java
@@ -51,6 +51,7 @@ public interface IErpDataProduceClient {
     String RETURN_OEM_ERP_BY_WXNO = API_PREFIX + "/returnOemErpByWxno";
     String SELECT_MAX_WOTOTQTY_BY_WONO = API_PREFIX + "/selectMaxWototqtyByWono";
     String SELECT_MAX_WOCLSTOTQTY_BY_WONO = API_PREFIX + "/selectMaxWoclstotqtyByWono";
+    String ERP_UPDATE_MAKE_QTY = API_PREFIX + "/erpUpdateMakeQty";
 
     /**
      * 缺件申报-通过零件号获取批次号
@@ -245,6 +246,7 @@ public interface IErpDataProduceClient {
     @GetMapping(SELECT_MAX_WOCLSTOTQTY_BY_WONO)
     R<Double> selectMaxWoclstotqtyByWono(@RequestParam(value = "code") String code);
 
+    @GetMapping(ERP_UPDATE_MAKE_QTY)
     R<String> erpUpdateMakeQty(@RequestParam(value = "woCode") String woCode, @RequestParam(value = "memo", required = false) String memo,
                                @RequestParam(value = "qtyAfter") Double qtyAfter, @RequestParam(value = "userName", required = false) String userName);
 }
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 f85051eaa..859a78fef 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
@@ -622,13 +622,13 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
             // 修改车间订单数量
             WorkOrder workOrder = workOrderService.getWorkOrderByCardNo(yieldOrder.getCardNo());
             if (workOrder != null) {
-                WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
-                try {
+//                WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
+//                try {
                     // erp接口调用更新数量
-                    erpDataProduceClient.erpUpdateMakeQty(workOrderRun.getWoCode(), mesDataMaintainLog.getMemo(), mesDataMaintainLog.getQtyAfter(), AuthUtil.getUserName()).getData();
-                } catch (Exception e) {
-                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
-                }
+//                    erpDataProduceClient.erpUpdateMakeQty(workOrderRun.getWoCode(), mesDataMaintainLog.getMemo(), mesDataMaintainLog.getQtyAfter(), AuthUtil.getUserName()).getData();
+//                } catch (Exception e) {
+//                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
+//                }
                 double num = mesDataMaintainLog.getQtyAfter() - yieldOrder.getYpQty();
                 workOrderService.update(Wrappers.lambdaUpdate(WorkOrder.class).eq(WorkOrder::getId, workOrder.getId()).set(WorkOrder::getMakeQty, workOrder.getMakeQty() + num));
                 // 修改作业计划接收数量、报工数量