From a7c909deb99eba5e2baa1bebd0e53671dc813162 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 25 Sep 2024 10:43:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=89=E5=B7=A5=E5=8D=95=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=8B=BC=E6=8E=A5=E4=BD=8D=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E4=BB=A3=E7=A0=81+=E5=B7=A5=E5=8D=95=E7=B1=BB=E5=9E=8B=20+?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81+?= =?UTF-8?q?=E7=8F=AD=E6=AC=A1+=E6=B5=81=E6=B0=B4=E5=8F=B7,numberRule?= =?UTF-8?q?=E5=8F=AA=E9=9C=80=E8=A6=81=E7=94=9F=E6=88=90=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/roundness/MesPackageRoundnessService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 3848f75..89d264d 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 @@ -428,10 +428,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { */ GenSerialNoModel genSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_NO_WU_HAN"); genSerialNoModel.setPartNo(mesPartProdGroupDetail.getWorkCenterCode()); - String dynamicRule=organizeCode+","+mesWorkOrder.getOrderFlag()+","+sortInfo.getCustOrderCode()+","+mesWorkOrder.getShiftCode(); - genSerialNoModel.setDynamicRule(dynamicRule); List resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList(); - mesWorkOrder.setWorkOrderNo(resultList.get(0)); + 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); if (!workOrderPartList.isEmpty()) { for (MesWorkOrderPart orderPart : workOrderPartList) {