Merge branch 'dev_temp_xw_202502070000_44985' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/TestController.java

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.busi;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesBtoJobService;
+import cn.estsh.i3plus.ext.mes.api.busi.IMesOfflineService;
 import cn.estsh.i3plus.ext.mes.apiservice.schedulejob.*;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -33,6 +35,9 @@ public class TestController {
     @Autowired
     private IMesBtoJobService btoJobService;
 
+    @Autowired
+    private IMesOfflineService mesOfflineService;
+
     @GetMapping("/reportOrder")
     @ApiOperation(value = "报工")
     public void reportOrder() {
@@ -74,4 +79,13 @@ public class TestController {
     public void mesQmsScrap() {
         mesQmsScrapJob.executeMesJob(null, null);
     }
+
+    @GetMapping("/doCreatePullOrderOfflineData")
+    @ApiOperation(value = "doCreatePullOrderOfflineData")
+    public void doCreatePullOrderOfflineData() {
+        List<String> list = new ArrayList<>();
+        list.add("100");
+        list.add("200");
+        mesOfflineService.doCreateSortRuleCfgOfflineData("CR01", list);
+    }
 }

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

@@ -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) {