From 821c4d7acceef522fee76a5437c902c8f59bb43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Mon, 12 Aug 2024 16:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=8F=AA=E5=9C=A8=20=E5=8C=B9=E9=85=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=89=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
index 8e7b741..97d85e2 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
@@ -588,13 +588,14 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         oldMesWorkOrder.setReportedQty(MathOperation.add(oldMesWorkOrder.getNum(), oldMesWorkOrder.getReportedQty()));
         if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) {
             oldMesWorkOrder.setCompleteQty(oldMesWorkOrder.getReportedQty());
+            double unCompleteQty = MathOperation.sub(oldMesWorkOrder.getQty(), oldMesWorkOrder.getReportedQty());
+            oldMesWorkOrder.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0);
         }
         //更新SAP计划完成数量
         saveMesProductPlan(oldMesWorkOrder, false, true);
 
         //更新工单状态
-        double unCompleteQty = MathOperation.sub(oldMesWorkOrder.getQty(), oldMesWorkOrder.getReportedQty());
-        oldMesWorkOrder.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0);
+
         if (oldMesWorkOrder.getReportedQty() >= oldMesWorkOrder.getQty()) {
             oldMesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
         }  else {