From bf84728bc2b49ce5bf1738ea05c83d7409282647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Sat, 11 May 2024 15:09:09 +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  | 12 +++++++++++-
 1 file changed, 11 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 6819553..1f6dc25 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
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@@ -39,6 +40,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
     @Autowired
     private MesJisShippingRepository jisShippingRepository;
+    @Autowired
+    private IMesConfigService configService;
 
 
     protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
@@ -253,19 +256,26 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         DdlPreparedPack.getStringEqualPack(originBean.getShippingOrderNo(), "shippingOrderNo", detailPackBean);
         List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
 
+        ;
         List<MesJisShipping> jisShippingList = new ArrayList<>();
         detailDeleteList.forEach(k -> {
             MesJisShipping jisShipping = new MesJisShipping();
             BeanUtils.copyProperties(originBean, jisShipping, "id");
             BeanUtils.copyProperties(k, jisShipping, "id");
-            jisShipping.setFactoryCode(originBean.getCustPlantCode());
+            jisShipping.setFactoryCode(originBean.getOrganizeCode());
+            jisShipping.setCusCode(originBean.getCustCode());
             jisShipping.setShippingTime(TimeTool.getNowTime(true));
             jisShipping.setDock(originBean.getSendDockCode());
+            jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE"));
+            jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS"));
             jisShipping.setCusDock(originBean.getCustDockCode());
             jisShipping.setCustOrderNo(k.getCustOrderNo());
             jisShipping.setSerialNumber(k.getBarcode());
             jisShipping.setQuantityPerCar(detailDeleteList.size());
             jisShipping.setShippingOrderCode(originBean.getShippingOrderNo());
+            jisShipping.setVin(k.getVin());
+            jisShipping.setCarNo(k.getVin());
+            jisShipping.setOffTime(TimeTool.getNowTime(true));
             ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName());
             jisShippingList.add(jisShipping);
         });