0416

src/main/java/cn/ezhizao/project/business/controller/Inc10100Controller.java

@@ -76,7 +76,6 @@ public class Inc10100Controller extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('business:product:sync')")
     @GetMapping(value = "/getP2Product")
-    @Transactional
     public AjaxResult getP2Product() {
         boolean result;
 //        result = true;
@@ -388,7 +387,6 @@ public class Inc10100Controller extends BaseController {
                 }
             } else {
                 BizTechnologicalProcessDetail old = processDetails.stream().filter(v -> v.getTechnologyVersion().equals(l.getPrver().trim()) && v.getProductCode().equals(l.getCpart().trim()) && v.getProcessCode().equals(l.getPrcode().trim()) && v.getTechnologicalProcessId().equals(oldTech.getId())).findFirst().orElse(null);
-
                 Long count = processDetails.stream().filter(v -> v.getTechnologyVersion().equals(l.getPrver().trim()) && v.getProductCode().equals(l.getCpart().trim())).count();
                 Long newCount = all10401List.stream().filter(v -> v.getCpart().trim().equals(l.getCpart().trim()) && v.getPrver().trim().equals(l.getPrver().trim())).count();
                 if (old == null || !old.getProcessStepNumber().trim().equals(l.getPrseq().trim()) || !newCount.equals(count)) {
@@ -438,25 +436,23 @@ public class Inc10100Controller extends BaseController {
         changeSfc10400.forEach(l -> {
             BizTechnologicalProcess oldTech = processes.stream().filter(v -> v.getTechnologyVersion().trim().equals(l.getPrver().trim()) && v.getProductCode().trim().equals(l.getCpart().trim()) && v.getIsHistory().equals(0)).findFirst().orElse(null);
             // 判断是否已有新版本 假设已有不更新 没有则更新
-
             Long count = processDetails.stream().filter(v -> v.getTechnologyVersion().equals(l.getPrver().trim()) && v.getProductCode().equals(l.getCpart().trim())).count();
             Long newCount = allChangeSfc10401.stream().filter(v -> v.getCpart().trim().equals(l.getCpart().trim()) && v.getPrver().trim().equals(l.getPrver().trim())).count();
-            System.out.println("count"+count);
-            System.out.println("newCount"+newCount);
+            System.out.println("count:" + count + "：：：：：：：：：：：newCount:" + newCount);
             if (!saveProcess.stream().anyMatch(t -> t.getProductCode().trim().equals(l.getCpart().trim()) && t.getTechnologyVersion().trim().equals(l.getPrver().trim())) && !count.equals(newCount)) {
                 BizTechnologicalProcess newTech;
-                // 假设旧工艺不存在，或新的工艺序号和旧的不同则将旧工艺版本isHistory置为1
+
                 if(oldTech!=null){
                     oldTech.setIsHistory(1);
                     updateProcess.add(oldTech);
                     newTech = new BizTechnologicalProcess(oldTech);
-                }else{
-                    newTech=new BizTechnologicalProcess();
+                }else {
+                    newTech = new BizTechnologicalProcess();
                 }
 
                 // 判断是否已加过对应工艺
-                newTech.setIsHistory(0);
 
+                newTech.setIsHistory(0);
                 newTech.setId(snowflakeIdWorker.nextId());
                 saveProcess.add(newTech);
                 // 添加所有工艺明细
@@ -628,8 +624,8 @@ public class Inc10100Controller extends BaseController {
     @GetMapping(value = "/getP2ProductV0")
     public AjaxResult getP2ProductV0() {
         boolean result;
-        result = true;
-//        result = getP2Process();
+//        result = true;
+        result = getP2Process();
         // 先从新系统中的 biz_pull_p2_time 中获取最新数据
         BizPullP2Time pullDetail = new BizPullP2Time();
         pullDetail.setType("product");