From bc76beab750d7e0fe54706f80ee98390fafb11dc Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 27 Dec 2024 16:36:11 +0800 Subject: [PATCH] 43316 --- .../i3plus/ext/mes/api/base/IMesBomService.java | 2 + .../apiservice/serviceimpl/base/MesBomService.java | 33 +++++++++++-- .../serviceimpl/busi/MesCreateWorkOrderImpl.java | 56 +++++++++++++++------- 3 files changed, 69 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java index 67600e1..11508ae 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java @@ -63,6 +63,8 @@ public interface IMesBomService extends IBaseMesService { */ MesBom findBom(String organizeCode, String bomVersion,String partNo); + MesBom findBom(String organizeCode, String partNo); + @ApiOperation(value = "bom反向查询") List queryMesBomReverse(MesBom mesBom); } 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 af45a30..07372c7 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 @@ -167,7 +167,9 @@ public class MesBomService extends BaseMesService implements IMesBomServ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean); - DdlPreparedPack.getStringEqualPack(bomVersion, "bomVersion", ddlPackBean); + if (!StringUtils.isEmpty(bomVersion)) { + DdlPreparedPack.getStringEqualPack(bomVersion, "bomVersion", ddlPackBean); + } DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), MesExtConstWords.EFF_START_TIME, ddlPackBean); if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), MesExtConstWords.EFF_END_TIME, ddlPackBean); DdlPreparedPack.getOrderBy(MesExtConstWords.EFF_START_TIME, CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean); @@ -175,9 +177,14 @@ public class MesBomService extends BaseMesService implements IMesBomServ if (CollectionUtils.isEmpty(mesBoms)) { MesException.throwMesBusiException("物料【%s】生产版本【%s】对应bom信息不存在", partNo, bomVersion); } - MesBom next = mesBoms.iterator().next(); - //如果存在多个bomCode取最新的一个 - return mesBoms.stream().collect(Collectors.groupingBy(t -> t.getBomCode() + t.getEffStartTime())).get(next.getBomCode() + next.getEffStartTime()); + MesBom mesBom = mesBoms.get(0); + String bomCode = mesBom.getBomCode(); + String effStartTime = mesBom.getEffStartTime(); + DdlPackBean ddlPackBean1= DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean1); + DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", ddlPackBean1); + DdlPreparedPack.getStringEqualPack(effStartTime, "effStartTime", ddlPackBean1); + return baseRDao.findByHqlWhere(ddlPackBean); } @Override @@ -224,6 +231,24 @@ 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); + } + + @Override + public MesBom findBom(String organizeCode, String partNo) { + //MES汇报查询BOM是否携带结束查询条件 + MesConfig config = mesConfigService.getCfgValueByCode(organizeCode, MesExtConstWords.MES_REPORT_FIND_BOM_WITH_EFFENDTIME); + Boolean isWithEffEndTime = (null != config && !StringUtils.isEmpty(config.getCfgValue()) && config.getCfgValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) ? true : false; + + DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(partNo, "partNo", bomPackBean); + DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), "effStartTime", bomPackBean); + if (isWithEffEndTime){ + DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), "effEndTime", 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); } 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 7f89c7b..f1b8e6f 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 @@ -19,7 +19,6 @@ import cn.estsh.i3plus.pojo.mes.repository.*; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.util.Strings; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -200,19 +199,41 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { /** * 生产版本是根据 生产零检号查询，不是根据erp零件号查询 */ - MesProductVersion prodVersion = getProdVersion(organizeCode, mesPartProdGroupDetail.getProductPartNo()); - if (prodVersion == null) { - log.info("请配置工厂:{},partNo:{}的生产版本", mesPartProdGroupDetail.organizeCode, mesPartProdGroupDetail.getProductPartNo()); - } else { - String productVersion = prodVersion.getProductVersion(); - mesWorkOrder.setProductVersion(productVersion); + /** + * 2024-12-13 bug 44316 排序工单bom拆分 修改 by castle + * 目前排序工单EDI解析和手工插单，获取BOM的逻辑需要调整 + * + * -武汉排序线为移库，不做汇报；其他工厂排序存在汇报情况 + * 1）不使用生产版本获取BOM + * 2）使用生产版本获取BOM + * + * 暂定方案： + * 1）零件生产组增加配置：是否根据生产版本拆分BOM + * 2）根据配置确认获取BOM方式 + * 是：根据现有方式获取BOM + * + * 否：不根据生产版本获取BOM; + * 根据总成零件号取最近的生效时间limit 1，取ECN变更号一致且生效时间一致的一组数据 + * ***BOM失效时间 > 当天 ＆＆ BOM生效时间 <= 当前时间（yyyy-mm-dd hh:MM:ss） + */ + MesBom bom; + 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()); + } else { + String productVersion = prodVersion.getProductVersion(); + mesWorkOrder.setProductVersion(productVersion); + } + bom = mesBomService.findBom(organizeCode, prodVersion == null ? null : prodVersion.getAlternativePartList(), mesPartProdGroupDetail.getProductPartNo()); + }else { + bom = mesBomService.findBom(organizeCode, mesPartProdGroupDetail.getProductPartNo()); } // bom prodVersion.alternativePartList bom版本 /** * bom也需要根据生产零件号拆分 */ - MesBom bom = mesBomService.findBom(organizeCode, prodVersion == null ? null : prodVersion.getAlternativePartList(), mesPartProdGroupDetail.getProductPartNo()); if (bom != null) { mesWorkOrder.setBomCode(bom.getBomCode()); } else { @@ -313,7 +334,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { List workOrderPartList = new ArrayList<>(); if (partProdGroup.getIsDisassembleBom() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { //打散bom使用生产零件号 - workOrderPartList = dismantleBom(mesPartProdGroupDetail.getProductPartNo(), mesWorkOrder.getQty(), sortInfo.getMatchTime(), bom.getBomCode(), sortInfo.getOrganizeCode(), mesPartProdGroupDetail.getWorkCellCode(), mesWorkOrder.getWorkOrderNo()); + workOrderPartList = dismantleBom(bom, mesPartProdGroupDetail.getProductPartNo(), mesWorkOrder.getQty(), sortInfo.getMatchTime(), sortInfo.getOrganizeCode(), mesPartProdGroupDetail.getWorkCellCode(), mesWorkOrder.getWorkOrderNo()); } @@ -362,7 +383,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { //客户ptr信息 StringBuilder ptrInfos = new StringBuilder(); String ptrInfo = mesWorkOrder.getPtrInfo(); - List custPtrPartList = Arrays.asList(ptrInfo.replaceAll("_","").split("\\|")); + List custPtrPartList = Arrays.asList(ptrInfo.split("\\|")); boolean ptrFlag = false; boolean custFlag = false; boolean fOrderFlag = false; @@ -784,11 +805,11 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { } return null; } - private List dismantleBom(String partNo, double qty, String productTime, String bomCode, String organizeCode, String workCellCode, String workOrderNo) { + private List dismantleBom(MesBom mesBom, String partNo, double qty, String productTime, String organizeCode, String workCellCode, String workOrderNo) { List orderPartList = new ArrayList<>(); //1.根据bomCode,partNo productTime organizeCode 查询bom清单 bomList - List bomList = getPlatBom(partNo, productTime, bomCode, organizeCode); + List bomList = getPlatBom(mesBom,partNo, productTime, organizeCode); //2.根据bomList中的subPartNo 查询零件清单 partList List partNoList = bomList.stream().map(MesBom::getItemPartNo).distinct().collect(Collectors.toList()); @@ -828,13 +849,12 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { return orderPartList; } - private List getPlatBom(String partNo, String effectiveTime, String bomCode, String organizeCode) { - + private List getPlatBom(MesBom mesBom,String partNo, String effectiveTime,String organizeCode) { //MES汇报查询BOM是否携带结束查询条件 MesConfig config = mesConfigService.getCfgValueByCode(organizeCode, MesExtConstWords.MES_REPORT_FIND_BOM_WITH_EFFENDTIME); Boolean isWithEffEndTime = (null != config && !org.springframework.util.StringUtils.isEmpty(config.getCfgValue()) && config.getCfgValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) ? true : false; - if (bomCode == null) { + if (mesBom == null) { //首先根据虚结构的零件号查询出最新的一条bom信息作为bomCode DdlPackBean bomCodePackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomCodePackBean); @@ -845,12 +865,12 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { if (bomList == null || bomList.isEmpty()) { return new ArrayList<>(); } - bomCode = bomList.get(0).getBomCode(); + mesBom = bomList.get(0); } List bomResultList = new ArrayList<>(); DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", bomPackBean); + DdlPreparedPack.getStringEqualPack(mesBom.getBomCode(), "bomCode", bomPackBean); DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomPackBean); DdlPreparedPack.getStringSmallerPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean); if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(effectiveTime, MesExtConstWords.EFF_END_TIME, bomPackBean); @@ -858,7 +878,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { for (MesBom bom : bomList) { if (bom.getPartType() != null && bom.getPartType().equalsIgnoreCase("X")) { - getPlatBom(bom.getItemPartNo(), effectiveTime, null, organizeCode); + getPlatBom(null,bom.getItemPartNo(), effectiveTime, organizeCode); } else { bom.setBomCode(bom.getBomCode().toLowerCase()); bomResultList.add(bom);