Merge remote-tracking branch 'origin/dev_temp-xw-202502100000-44985' into test

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java

@@ -119,7 +119,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
            return;
        }
         //6.装配件获取的三种条件
-        String custCode = mesCustomerPart.getCustCode();
+        String custCode = mesPartProdGroup.getCustCode();
         MesCustomerCarModel mesCustomerCarModel = getMesCustomerCarModel(custPartNo, organizeCode, custCode);
         if (mesCustomerCarModel == null) {
             return;
@@ -141,6 +141,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
         String carModelCode = mesCustomerCarModel.getCarModelCode();
         List<MesWorkOrderAssembly> assemblyList = getAssemblyList(detail.getWorkCenterCode(), carModelCode, workOrderPartList, mesPartProdGroup);
         //7.保存到离线表中
+        List<MesProdRuleSortCfgOffline> offlineList = new ArrayList<>();
         for (MesWorkOrderAssembly orderAssembly : assemblyList) {
             MesProdRuleSortCfgOffline cfgOffline = new MesProdRuleSortCfgOffline();
             BeanUtils.copyProperties(orderAssembly, cfgOffline);
@@ -153,8 +154,10 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
             cfgOffline.setRemark(mesCustomerCarModel.getCarModelName());
             cfgOffline.setOrganizeCode(organizeCode);
             ConvertBean.saveOrUpdate(cfgOffline, "OFFLINE-JOB");
-            cfgOfflineRao.insert(cfgOffline);
+            offlineList.add(cfgOffline);
         }
+        cfgOfflineRao.saveAll(offlineList);
+
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -333,7 +336,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
         DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", bomPackBean);
         DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomPackBean);
-        DdlPreparedPack.getStringEqualPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean);
+        DdlPreparedPack.getStringSmallerPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean);
         List<MesBom> bomList = bomRao.findByHqlWhere(bomPackBean);
 
         for (MesBom bom : bomList) {