From f2957726925d74f7b19dbfd956c9b6a14676da5f Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Fri, 25 Oct 2024 14:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 b073b1b..76e1fee 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 @@ -462,7 +462,7 @@ public class MesWorkOrderService extends BaseMesService implements DdlPackBean ddlPackBean; ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean); + //DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean); ddlPackBean.setOrderByStr(" order by createDatetime desc "); MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean); if (Objects.isNull(mesProductVersion)) { @@ -558,7 +558,8 @@ public class MesWorkOrderService extends BaseMesService implements } else if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) { Long produceSeq = 0L; if (null != result && result.getProduceSeq() != null) { - produceSeq = (long) Math.toIntExact(result.getProduceSeq()); + //produceSeq = (long) Math.toIntExact(result.getProduceSeq()); + produceSeq = result.getProduceSeq(); } item.setProduceSeq(produceSeq + 1); item.setWorkOrderSeq(seqList.get(index)); @@ -625,7 +626,7 @@ public class MesWorkOrderService extends BaseMesService implements List orderList=new ArrayList<>(); Map> mesProductVersionMap =null; if(next.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){ - mesProductVersionMap = mesProductVersionList.stream().collect(Collectors.groupingBy(t -> t.getWorkCenterCode() + t.getPartNo())); + mesProductVersionMap = mesProductVersionList.stream().collect(Collectors.groupingBy(t -> t.getPartNo())); GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO); genSerialNoModel.setPartNo(next.getWorkCenterCode()); orderList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(next.getOrganizeCode()), next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList(); @@ -788,7 +789,7 @@ public class MesWorkOrderService extends BaseMesService implements List mesBomList = null; if (!MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue().equals(item.getOrderFlag())){ //获取生产版本 - List mesProductVersions = mesProductVersionMap.get(mesWorkCenter.getErpWorkCenter() + item.getPartNo()); + List mesProductVersions = mesProductVersionMap.get(item.getPartNo()); if (CollectionUtils.isEmpty(mesProductVersions)) { MesException.throwMesBusiException("物料【%s】工作中心【%s】对应的生产版本信息不存在", item.getPartNo(), mesWorkCenter.getErpWorkCenter()); @@ -1631,6 +1632,7 @@ public class MesWorkOrderService extends BaseMesService implements private boolean checkWorkCenterPartRelation(String workCenterCode,String partNo){ DdlPackBean partRelationPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); + //DdlPackBean partRelationPackBean = DdlPackBean.getDdlPackBean("CK01"); DdlPreparedPack.getStringEqualPack(workCenterCode,"workCenterCode", partRelationPackBean); DdlPreparedPack.getStringEqualPack(partNo, "partNo", partRelationPackBean); int count = partRelationRao.findByHqlWhereCount(partRelationPackBean);