From c04c83b504b8c1b7c6604a20395d7beb1829a07a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Mon, 13 May 2024 09:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 04d4f9b..fb23244 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
@@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.repository.MesJisShippingRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -43,6 +44,9 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     @Autowired
     private IMesConfigService configService;
 
+    @Autowired
+    private MesPartRepository partRepository;
+
 
     protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
@@ -259,6 +263,11 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         ;
         List<MesJisShipping> jisShippingList = new ArrayList<>();
         detailDeleteList.forEach(k -> {
+
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+            DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean);
+            MesPart part = partRepository.getByProperty(packBean);
+
             MesJisShipping jisShipping = new MesJisShipping();
             BeanUtils.copyProperties(originBean, jisShipping, "id");
             BeanUtils.copyProperties(k, jisShipping, "id");
@@ -275,7 +284,9 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             jisShipping.setShippingOrderCode(originBean.getShippingOrderNo());
             jisShipping.setVin(k.getVin());
             jisShipping.setCarNo(k.getVin());
-            jisShipping.setUnit(originBean.getUnit());
+            if(!StringUtils.isEmpty(part)){
+                jisShipping.setUnit(part.getUnit());
+            }
             jisShipping.setOffTime(TimeTool.getNowTime(true));
             ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName());
             jisShippingList.add(jisShipping);