0416

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

@@ -439,9 +439,6 @@ public class Inc10100Controller extends BaseController {
             // 判断是否已有新版本 假设已有不更新 没有则更新
             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("saveProcess"+saveProcess);
-            System.out.println("l"+l);
-            System.out.println("qian"+saveProcess.stream().anyMatch(t -> t.getProductCode().trim().equals(l.getCpart().trim()) && t.getTechnologyVersion().trim().equals(l.getPrver().trim())));
             if (!saveProcess.stream().anyMatch(t -> t.getProductCode().trim().equals(l.getCpart().trim()) && t.getTechnologyVersion().trim().equals(l.getPrver().trim())) && !count.equals(newCount)) {
                 BizTechnologicalProcess newTech;
 
@@ -452,10 +449,39 @@ public class Inc10100Controller extends BaseController {
                 }else {
                     newTech = new BizTechnologicalProcess();
                 }
-
+                Sfc10401 sfc10401 = sfc10401List.stream().filter(v -> v.getPrver().trim().equals(l.getPrver().trim()) && v.getCpart().trim().equals(l.getCpart().trim())).findFirst().orElse(null);
                 // 判断是否已加过对应工艺
-
                 newTech.setIsHistory(0);
+                newTech.setProductCode(l.getCpart().trim());
+                newTech.setTechnologyVersion(l.getPrver());
+                newTech.setTenantId(Long.parseLong(sfc10401.getFacno()));
+                BizTechnologicalProcessDetail newProcess = new BizTechnologicalProcessDetail();
+
+                newProcess.setTechnologyVersion(l.getPrver().trim());
+                newProcess.setProductCode(l.getCpart().trim());
+                newProcess.setProcessCode(sfc10401.getPrcode().trim());
+                newProcess.setProcessStepNumber(sfc10401.getPrseq());
+                newProcess.setProcessKey(sfc10401.getFinkey());
+                newProcess.setProcessAlias(sfc10401.getPrna());
+                newProcess.setProductShaftCategory(sfc10401.getZtype());
+                newProcess.setProductShaftCategoryName(sfc10401.getZtydm());
+                newProcess.setProductDescription(sfc10401.getDescr());
+                newProcess.setTenantId(Long.parseLong(sfc10401.getFacno()));
+                if (newTech.getProductCode() != null && !newTech.getProductCode().isEmpty()) {
+                    BizProduct bizProduct = products.stream().filter(v -> v.getProductCode().trim().equals(l.getCpart().trim())).findFirst().orElse(null);
+                    if (bizProduct != null) {
+                        newTech.setProductId(bizProduct.getId());
+                    }
+                    bizProduct = newProducts.stream().filter(v -> v.getProductCode().trim().equals(l.getCpart().trim())).findFirst().orElse(null);
+                    if (bizProduct != null && newProcess.getProductId() == null) {
+                        newTech.setProductId(bizProduct.getId());
+                    }
+                }
+                newTech.setProductShaftCategory(l.getZtype());
+                newTech.setProductShaftCategoryName(l.getZtydm());
+                newTech.setProductSpecification(l.getSpec());
+                newTech.setProductDrawingNumber(l.getDraw());
+                newTech.setProductDescription(l.getDescr());
                 newTech.setId(snowflakeIdWorker.nextId());
                 saveProcess.add(newTech);
                 // 添加所有工艺明细