From 1546e0118e19a1e251f60f48a55136459916c98c Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 6 Jun 2024 22:09:01 +0800 Subject: [PATCH] =?UTF-8?q?MES-PCN=20=E7=82=B9=E6=A3=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesSpotCheckOrderService.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index c62ecd7..cc141d8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -430,13 +430,20 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { } //生成单据号 - GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE); - List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); +// GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE); +// List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); + String orderNo=""; + BaseResultBean orderResutlBean = sysOrderNoRuleCloud.getOrderNo(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE); + if (orderResutlBean != null && orderResutlBean.isSuccess()) { + orderNo = orderResutlBean.getResultObject().get(WmsConstWords.CORE_ORDER_NO).toString(); + } else { + orderNo = TimeTool.getDateTime().replaceAll("-", "") + String.valueOf((int) (Math.random() * 9000) + 1000); + } //保存单据 BeanUtils.copyProperties(equipmentSpotCheck, bean, "id"); // bean.setSpotCheckOrderNo("SPOT_CHECK_ORDER_NO_0003"); - bean.setSpotCheckOrderNo(resultList.get(0)); + bean.setSpotCheckOrderNo(orderNo); ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); bean = spotCheckOrderRepository.insert(bean);