From 794559024b10e331ea0e6ab50fb7d2b884decd7e Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 26 七月 2022 14:39:15 +0800
Subject: [PATCH] 更新工作流

---
 src/main/java/com/whyc/service/WorksheetMainService.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index 23ae74b..f46fac5 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -41,6 +41,9 @@
     @Autowired
     private ProductBomApprovingService approvingService;
 
+    @Autowired
+    private ProductBomService bomService;
+
     @Transactional
     public boolean submit(WorksheetMain main, DocUser user) {
         List<ProductBomApproving> bomList = main.getApprovingBomList();
@@ -85,7 +88,17 @@
             return false;
         }
         //浜у搧bom/鍥剧焊鍥剧墖鎻愪氦
-        bomList.forEach(bom->bom.setMainId(main.getId()));
+
+        //鏌ヨ閮ㄤ欢鏈�鏂扮殑鐗堟湰鍙�
+        Integer version = bomService.getProduct(bomList.get(0).getParentModel()).getVersion();
+        if(version==null){
+            version = 0;
+        }
+        Integer finalVersion = version;
+        bomList.forEach(bom->{
+            bom.setMainId(main.getId());
+            bom.setVersion(finalVersion+1);
+        });
         approvingService.insert(bomList);
         return true;
     }

--
Gitblit v1.9.1