43316

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<MesBom> bomList = bomRao.findByHqlWhere(bomPackBean);
 
         for (MesBom bom : bomList) {