From ae5acb76b1c1746d89a33ff81c12c618cbc6dd41 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 14 Nov 2024 15:22:19 +0800 Subject: [PATCH] =?UTF-8?q?bom=E4=B8=8D=E7=94=9F=E6=95=88=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=A3=85=E9=85=8D=E4=BB=B6=E5=8F=8A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java index 042b131..0af1043 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java @@ -411,7 +411,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { String serialNo = resultList.get(0).replace("MES_WORK_ORDER_NO_WU_HAN", ""); String orderNoWuHan=organizeCode+mesWorkOrder.getOrderFlag()+sortInfo.getCustOrderCode()+mesWorkOrder.getShiftCode() + serialNo; mesWorkOrder.setWorkOrderNo(orderNoWuHan); - + List assemblyList = new ArrayList<>(); if (!workOrderPartList.isEmpty()) { for (MesWorkOrderPart orderPart : workOrderPartList) { orderPart.setOrganizeCode(organizeCode); @@ -419,8 +419,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { ConvertBean.saveOrUpdate(orderPart, "MES-JOB"); } workOrderPartRao.saveAll(workOrderPartList); + assemblyList = getAssemblyList(mesWorkOrder.getWorkCenterCode(), mesWorkOrder.getCarModelCode(), workOrderPartList, partProdGroup); } - List assemblyList = getAssemblyList(mesWorkOrder.getWorkCenterCode(), mesWorkOrder.getCarModelCode(), workOrderPartList, partProdGroup); // /** // * 生产序号 // * 工厂-产线-9位流水号,跳号10 @@ -672,6 +672,9 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { //2.根据bomList中的subPartNo 查询零件清单 partList List partNoList = bomList.stream().map(MesBom::getItemPartNo).distinct().collect(Collectors.toList()); + if (partNoList.isEmpty()) { + return new ArrayList<>(); + } DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(partNoList, "partNo", partPackBean); List partSapList = mesPartSapRao.findByHqlWhere(partPackBean);