From 3720a134c5e6af257c72b8d2c6095c82d7b4263f Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 26 Jun 2024 18:00:56 +0800 Subject: [PATCH] =?UTF-8?q?41606=20BTO=E5=B7=A5=E5=8D=95=E7=9A=84=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A7=84=E5=88=99=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=8B=AC=E7=AB=8B=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesWorkOrderService.java | 13 ++++++++++--- .../serviceimpl/base/roundness/MesTimeRoundnessService.java | 7 +++++-- 2 files changed, 15 insertions(+), 5 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 1162b4b..e0b09f6 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 @@ -562,8 +562,15 @@ public class MesWorkOrderService extends BaseMesService implements } } //生成工单号 - GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); - List orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList(); + List orderList=new ArrayList<>(); + if(next.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){ + GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO); + genSerialNoModel.setPartNo(next.getWorkCenterCode()); + orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), 1).getResultList(); + }else { + GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); + orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList(); + } //查询工单是否已经存在 DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(next.getOrganizeCode()); DdlPreparedPack.getInPackList(orderList, "workOrderNo", orderPackBean); @@ -817,7 +824,7 @@ public class MesWorkOrderService extends BaseMesService implements //更新工单 updateMesWorkOrder(mesWorkOrderDb); - //生成条码 + //生成条码 todo 有条码 不生成 String sn = getStringList(mesWorkOrder); //保存数据 List mesProductOffLineList = new ArrayList<>(); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java index 1950f5b..7e6fdbf 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java @@ -103,8 +103,11 @@ public class MesTimeRoundnessService implements IRoundnessStrategy { } MesWorkOrder mesWorkOrder = new MesWorkOrder(); //工单号生成规则 【工厂号+yyyyMMdd+5位流水】 - GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); - List resultList = syncFuncService.syncSerialNo(genSerialNoModel,"JOB", detail.getOrganizeCode(), 1).getResultList(); + GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO); + genSerialNoModel.setPartNo(detail.getWorkCenterCode()); + List resultList = syncFuncService.syncSerialNo(genSerialNoModel, "JOB", detail.getOrganizeCode(), 1).getResultList(); +// GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); +// List resultList = syncFuncService.syncSerialNo(genSerialNoModel,"JOB", detail.getOrganizeCode(), 1).getResultList(); mesWorkOrder.setWorkOrderNo(resultList.get(0)); mesWorkOrder.setWorkOrderType(MesExtEnumUtil.ORDER_TYPE.BTO.getValue()); mesWorkOrder.setWorkOrderSeq(createSeq.toString());