From 036aae4b79a4c3918071039e8e68fa968c5d10e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Sat, 11 May 2024 11:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesShippingOrderManagementService.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
index 3a27f8d..6819553 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
@@ -270,6 +270,19 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             jisShippingList.add(jisShipping);
         });
 
+        //修改当前发运单状态
+        originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
+
+        //修改当前发运单明细状态
+        detailDeleteList.forEach(k -> {
+            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
+            k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
+        });
+
+        ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
+        baseRDao.save(originBean);
+        detailService.updates(detailDeleteList);
+
         jisShippingRepository.saveAll(jisShippingList);
 
     }