From d3693836caa4d37bdc57438cf80a95fd49ec84e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Mon, 20 May 2024 18:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=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           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 28a0d00..7a09a69 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
@@ -295,7 +295,6 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             jisShipping.setShippingOrderCode(originBean.getShippingOrderNo());
             jisShipping.setVin(v.get(0).getVin());
             jisShipping.setCarNo(v.get(0).getVin());
-            jisShipping.setPartNo(part.getPartNo());
             if (!StringUtils.isEmpty(part)) {
                 jisShipping.setUnit(part.getUnit());
             }
@@ -310,8 +309,9 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
         //修改当前发运单明细状态
         detailDeleteList.forEach(k -> {
-            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
+            k.setActualQty(1);
             k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
+            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
         });
 
         ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());