From 27890b20a7d1bb109fd2972d842b0d98571dddc1 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:20:34 +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      | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 f78be46..28a0d00 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
@@ -125,16 +125,16 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         MesShippingOrderManagement finalBean = bean;
         groupDetailList.forEach(k -> {
             MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail();
-
+            BeanUtils.copyProperties(k, detail, "id");
             MesPart part = partService.getPartByPartNo(k.getPartNo(), k.getOrganizeCode());
             detail.setPartName(part.getPartName());
             detail.setCustPartNo(k.getCustomerPartNo());
             detail.setPlanQty(1);
-            detail.setActualQty(1);
+//            detail.setActualQty(1);
             detail.setShippingOrderNo(finalBean.getShippingOrderNo());
             detail.setOrganizeCode(k.getOrganizeCode());
             detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
-            BeanUtils.copyProperties(k, detail, "id");
+
             ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
             detailInsertList.add(detail);
         });
@@ -281,7 +281,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
             MesJisShipping jisShipping = new MesJisShipping();
             BeanUtils.copyProperties(originBean, jisShipping, "id");
-            BeanUtils.copyProperties(k, jisShipping, "id");
+            BeanUtils.copyProperties(v.get(0), jisShipping, "id");
             jisShipping.setFactoryCode(originBean.getOrganizeCode());
             jisShipping.setCusCode(originBean.getCustCode());
             jisShipping.setShippingTime(TimeTool.getNowTime(true));
@@ -295,6 +295,7 @@ 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());
             }