From 559a1c456a892aeb47ce5fd2bf0fbbee1ede6fcc Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 25 Dec 2024 17:54:23 +0800 Subject: [PATCH 1/3] 43316 --- .../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 8966256..c7ba85b 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 @@ -509,7 +509,9 @@ public class MesWorkOrderService extends BaseMesService implements if (!MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue().equals(item.getOrderFlag())) { //获取生产版本 mesProductVersion = getMesProductVersion(item.getOrganizeCode(),item.getPartNo()); - item.setProductVersion(mesProductVersion.getProductVersion()); + if (mesProductVersion != null) { + item.setProductVersion(mesProductVersion.getProductVersion()); + } } //是否自动发布 return isAuto(item, mesProductVersion); @@ -1196,6 +1198,9 @@ public class MesWorkOrderService extends BaseMesService implements if (StringUtil.isEmpty(model.getSn())) { //获取生产版本 MesProductVersion mesProductVersion = getMesProductVersion(model.getOrganizeCode(),model.getPartNo()); + if (Objects.isNull(mesProductVersion)) { + MesException.throwMesBusiException("物料【%s】生产版本信息不存在", model.getPartNo()); + } //获取bom List mesBoms = mesBomService.findBomList(mesPart.getOrganizeCode(), mesPart, mesProductVersion.getAlternativePartList()); //生成流水码 @@ -2752,9 +2757,6 @@ public class MesWorkOrderService extends BaseMesService implements private MesProductVersion getMesProductVersion(String organizeCode, String partNo) { MesProductVersion mesProductVersion = mesProductVersionService.getMesProductVersionByPartNoAndProductVersion(organizeCode, partNo, null); - if (Objects.isNull(mesProductVersion)) { - MesException.throwMesBusiException("物料【%s】生产版本信息不存在", partNo); - } return mesProductVersion; } From 8074411c3c1369dfc11c2f9904aa0dd6e0933bc6 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 25 Dec 2024 19:11:54 +0800 Subject: [PATCH 2/3] 43316 --- .../estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index 403adda..a760946 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java @@ -212,6 +212,7 @@ public class MesBomService extends BaseMesService implements IMesBomServ DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(partNo, "partNo", bomPackBean); DdlPreparedPack.getStringEqualPack(bomVersion, "bomVersion", bomPackBean); + DdlPreparedPack.getOrderBy("effStartTime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), bomPackBean); List bomList = this.baseRDao.findByHqlTopWhere(bomPackBean,1); return bomList.isEmpty() ? null : bomList.get(0); } From 549e8023f5abbd5bd67a3c426d5db7e9b5b15661 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 25 Dec 2024 19:12:26 +0800 Subject: [PATCH 3/3] 43316 --- .../ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java index c1fc3c7..5b18249 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java @@ -213,7 +213,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { * ***BOM失效时间 > 当天 ＆＆ BOM生效时间 <= 当前时间（yyyy-mm-dd hh:MM:ss） */ MesBom bom; - if (partProdGroup.getEnableBomVersion() != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ + if (partProdGroup.getEnableBomVersion() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ MesProductVersion prodVersion = getProdVersion(organizeCode, mesPartProdGroupDetail.getProductPartNo()); if (prodVersion == null) { log.info("请配置工厂:{},partNo:{}的生产版本", mesPartProdGroupDetail.organizeCode, mesPartProdGroupDetail.getProductPartNo()); @@ -842,7 +842,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(mesBom.getBomCode(), "bomCode", bomPackBean); DdlPreparedPack.getStringEqualPack(partNo, "partNo", bomPackBean); - DdlPreparedPack.getStringEqualPack(effectiveTime, "effStartTime", bomPackBean); + DdlPreparedPack.getStringEqualPack(mesBom.getEffStartTime(), "effStartTime", bomPackBean); List bomList = bomRao.findByHqlWhere(bomPackBean); for (MesBom bom : bomList) {