From 9228827ff508c5d0043aa8656f274b58c81bb517 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 10 Oct 2024 13:27:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java | 2 +- .../serviceimpl/base/roundness/MesPackageRoundnessService.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java index b8c5949..855a9f4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java @@ -110,7 +110,7 @@ public class MesBtoJobServiceImpl implements IMesBtoJobService { List sortInfoList = mesCustSoftInfoService.queryCustSortInfoList(prodGroup.getCustCode(), prodGroup.getCustOrganizeCode(), prodGroup.getCustInfoPoint(), organizeCode, custPartNoList); if (sortInfoList.isEmpty()){ log.info("当前零件生产组:{}没有排序信息",prodGroup.getCustInfoPoint()); - return; + continue; } //6. 根据零件生产组的RoundnessType 去做策略，现在只做 窗口时间 策略; 入参 String roundnessService = MesExtEnumUtil.SHIPPING_GROUP_ROUND_METHOD.valueOfService(prodGroup.getRoundMethod()); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java index 64833c8..fbd474b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java @@ -453,11 +453,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { } /** * 工单号修改 - * {dynamicRule}{dynamicRule}{dynamicRule}{dynamicrule}{serialNo} + * {ORG}{dynamicRule}{dynamicRule}{dynamicrule}{serialNo} * 工厂代码+工单类型 +客户工厂代码+班次+流水号 */ GenSerialNoModel genSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_NO_WU_HAN"); - genSerialNoModel.setPartNo(mesPartProdGroupDetail.getWorkCenterCode()); List resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList(); String serialNo = resultList.get(0).replace("MES_WORK_ORDER_NO_WU_HAN", ""); String orderNoWuHan=organizeCode+mesWorkOrder.getOrderFlag()+sortInfo.getCustOrderCode()+mesWorkOrder.getShiftCode() + serialNo; @@ -476,12 +475,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { * 生产序号 * 工厂-产线-9位流水号,跳号10 */ - GenSerialNoModel prodSeqSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_NO_WU_HAN"); + GenSerialNoModel prodSeqSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_SEQ_WU_HAN"); prodSeqSerialNoModel.setProdLocation(mesWorkOrder.getWorkCenterCode()); - List proSeqResultList = syncFuncService.syncSerialNo(prodSeqSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList(); String proSeqStr = proSeqResultList.get(0); - mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace(organizeCode, "").replace(mesWorkOrder.getWorkCenterCode(),""))); + mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace("MES_WORK_ORDER_SEQ_WU_HAN", ""))); mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName()); ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB"); mesWorkOrderRao.insert(mesWorkOrder); From fd88e32efbc1457d3835e80c5078de6d75a2e9fe Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 11 Oct 2024 13:42:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0carModelCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/roundness/MesPackageRoundnessService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java index fbd474b..1b8efa3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java @@ -505,6 +505,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { Map> cellCodeMap = assemblyList.stream().collect(Collectors.groupingBy(MesWorkOrderAssembly::getWorkCellCode)); for (String cellCode : cellCodeList) { MesQueueOrder mesQueueOrder = new MesQueueOrder(); + mesQueueOrder.setCarModelCode(mesWorkOrder.getCarModelCode()); mesQueueOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); mesQueueOrder.setOrganizeCode(organizeCode); mesQueueOrder.setWorkCellCode(cellCode);