From 560db850d867af16820e2fb64295de6cd49dd305 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Thu, 5 Sep 2024 10:41:37 +0800
Subject: [PATCH] =?UTF-8?q?42937=20=E5=85=B3=E9=97=AD=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=8F=AF=E4=BB=A5=E5=81=9A=E6=8A=A5=E5=B7=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
index d1c5ae7..12d15d3 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
@@ -873,7 +873,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             } else if (Objects.equals(mesWorkOrderDb.getReportedQty(), mesWorkOrderDb.getQty())) {
                 mesWorkOrderDb.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
             } else {
-                mesWorkOrderDb.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
+                mesWorkOrderDb.setWorkOrderStatus(mesWorkOrder.getWorkOrderStatus()==MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()?
+                        MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue():MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
             }
             mesWorkOrderDb.setCompleteQty(mesWorkOrderDb.getReportedQty());
         } else {