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