From d4a3b131df51fe2cf4649cefc46db9f675160c69 Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Wed, 21 Aug 2024 16:47:25 +0800
Subject: [PATCH] =?UTF-8?q?42660=20SAP=E7=94=9F=E8=AE=A1=E5=88=92=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=8E=87=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groovy/Mes2Pisces/MesToPiscesMesJisShipping.groovy   | 16 ++++++++++++++++
 .../apiservice/serviceimpl/base/MesWorkOrderService.java |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesJisShipping.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesJisShipping.groovy
index 4f359d3..d6f1ef4 100644
--- a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesJisShipping.groovy
+++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesJisShipping.groovy
@@ -1,8 +1,11 @@
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant
+import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService
 import cn.estsh.i3plus.platform.common.tool.MathOperation
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper
+import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel
 import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -23,6 +26,9 @@ class MesToPiscesMesJisShipping {
     @Autowired
     private MesShippingOrderManagementRepository mesShippingOrderManagementRepository;
 
+    @Autowired
+    private ISyncFuncService syncFuncService;
+
     def filterData(MesInterfaceDataMapper mapper, List<Map<String, Object>> srcData) throws Exception {
         if (srcData == null || srcData.size() == 0) {
             return srcData
@@ -47,6 +53,16 @@ class MesToPiscesMesJisShipping {
                 destData.put(key, rowMap)
             }
         }
+        //TRANS_ID赋值
+        if(mapper.getDestColumnMapping().contains("TRANS_ID")){
+            GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel("JIS_SHIPPING_TRANS_ID");
+            List<String> resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel.organizeCode(organizeCode), "MES2PISCES发运单", organizeCode, destData.size()).getResultList();
+            int index = 0;
+            for (Map<String, Object> rowMap : destData.values()) {
+                rowMap.put("TRANS_ID",resultList.get(index));
+                index++;
+            }
+        }
         return new ArrayList<>(destData.values());
     }
 
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
index c47d6fa..5147863 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
@@ -1257,6 +1257,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         newMesProductOffLine.setUnit(mesBom.getUnit());
         newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
         newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
+        newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType());
         newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
         newMesProductOffLine.setReportType(mesWorkOrder.getReportType());
@@ -1493,6 +1494,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 newMesProductOffLine.setUnit(mesBom.getUnit());
                 newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
                 newMesProductOffLine.setWorkOrderNo(mesWorkOrderDb.getWorkOrderNo());
+                newMesProductOffLine.setWorkOrderType(mesWorkOrderDb.getWorkOrderType());
                 newMesProductOffLine.setWorkCenterCode(mesWorkOrderDb.getWorkCenterCode());
                 newMesProductOffLine.setWorkCellCode(mesWorkOrderDb.getWorkCellCode());
                 newMesProductOffLine.setReportType(mesWorkOrderDb.getReportType());