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 5b92cb9..3139b72 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 @@ -81,10 +81,10 @@ public class MesWorkOrderService extends BaseMesService implements GenSerialNoModel genSerialNoModel = new GenSerialNoModel(); //若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1 if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { - Long produceSeq = 0L; - if (null != result && result.getProduceSeq() != null) { - produceSeq = (long) Math.toIntExact(result.getProduceSeq()); - } +// Long produceSeq = 0L; +// if (null != result && result.getProduceSeq() != null) { +// produceSeq = (long) Math.toIntExact(result.getProduceSeq()); +// } //生成工单号 genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); @@ -92,7 +92,7 @@ public class MesWorkOrderService extends BaseMesService implements MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); BeanUtils.copyProperties(bean, copyMesWorkOrder); - copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); +// copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); copyMesWorkOrder.setQty(1D); copyMesWorkOrder.setWorkOrderNo(resultList.get(0)); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); @@ -111,11 +111,11 @@ public class MesWorkOrderService extends BaseMesService implements } else { //生成工单号 genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); - Long produceSeq = 0L; - if (null != result && result.getProduceSeq() != null) { - produceSeq = (long) Math.toIntExact(result.getProduceSeq()); - } - bean.setProduceSeq((long) (produceSeq + 1)); +// Long produceSeq = 0L; +// if (null != result && result.getProduceSeq() != null) { +// produceSeq = (long) Math.toIntExact(result.getProduceSeq()); +// } +// bean.setProduceSeq((long) (produceSeq + 1)); GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ); List resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); bean.setWorkOrderSeq(resultList.get(0));