From 6b3edf90ac6e2d5bd0b977e872068b7fb8930b5c Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Wed, 15 Jan 2025 21:52:56 +0800
Subject: [PATCH] =?UTF-8?q?44852=20MES:=E7=94=9F=E4=BA=A7=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95-=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=B7=A5=E5=8D=95=E7=9A=84=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 daaa1bb..d3eaf16 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
@@ -719,6 +719,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         MesWorkOrder next = mesWorkOrderList.iterator().next();
         String nowDate = TimeTool.getNowTime(true);
         //获取产线信息
+        log.info("导入organizeCode={}", organizeCode);
         List<String> workCenterCodeList = mesWorkOrderList.stream().map(MesWorkOrder::getWorkCenterCode).distinct().collect(Collectors.toList());
         List<MesWorkCenter> mesWorkCenterList = BeanMapUtilsExt.getBeanList(mesWorkCenterRDao, MesExtConstWords.WORK_CENTER_CODE, organizeCode, workCenterCodeList, "产线信息");
         //产线导入不区分大小小
@@ -731,7 +732,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         Map<String, List<MesShift>> mesShiftMap = mesShiftList.stream().collect(Collectors.groupingBy(t -> t.getWorkCenterCode() + t.getShiftCode()));
         //获取生产版本
         List<String> partNoList = mesWorkOrderList.stream().map(MesWorkOrder::getPartNo).distinct().collect(Collectors.toList());
-        List<MesProductVersion> mesProductVersionList = BeanMapUtilsExt.getBeanList(mesProductVersionRDao, MesExtConstWords.PART_NO, organizeCode, partNoList, "生产版本信息");
+        List<MesProductVersion> mesProductVersionList = new ArrayList<>();
+        if (next.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
+            mesProductVersionList = BeanMapUtilsExt.getBeanList(mesProductVersionRDao, MesExtConstWords.PART_NO, organizeCode, partNoList, "生产版本信息");
+        }
         //客户物料信息
         Map<String, MesCustomerPart> mesCustomerPartMap = null;
         try {
@@ -913,7 +917,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
 
     private void autoPublish(Map<String, List<MesProductVersion>> mesProductVersionMap, Map<String, MesPartProdGroup> mesPartProdGroupMap, MesWorkOrder item, MesWorkCenter mesWorkCenter) {
         //发送工单信息给WMS
-        if (!MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue().equals(item.getOrderFlag())){
+        if (!MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue().equals(item.getOrderFlag())  && item.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.SORT.getValue()){
             //获取生产版本
             List<MesProductVersion> mesProductVersions = mesProductVersionMap.get(item.getPartNo());
             if (CollectionUtils.isEmpty(mesProductVersions)) {