From 60435508c1d01a18392d5d7fa90ebf5189e35e5a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 21 九月 2023 09:27:40 +0800
Subject: [PATCH] 产品和产品bom需要插入,version默认为-1

---
 src/main/java/com/whyc/service/ProductService.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index 9b76db2..bb874e9 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -682,18 +682,17 @@
             his.setEnabled(-1);
             phService.insertAndUpdateEnabled(his);
             //phService.insert(his);
-            // -> product 鐜版湁浜у搧鍜屼骇鍝乥om涓嶉渶瑕佹彃鍏�,浣嗘槸瑕佸仛鍒犻櫎鍘熸潵鐨勬棫鐗堟湰
+            // -> product 鐜版湁浜у搧鍜屼骇鍝乥om闇�瑕佹彃鍏�,version榛樿涓�-1,鍚屾椂瑕佸仛鍒犻櫎鍘熸潵鐨勬棫鐗堟湰
             product.setId(his.getId());
             product.setCreateTime(date);
-            product.setVersion(1);
-            //deleteAndInsert(product);
-            delete(product);
+            product.setVersion(-1);
+            deleteAndInsert(product);
             // -> bom
-            /*bomList.forEach(bom-> {
+            bomList.forEach(bom-> {
                 bom.setProductId(product.getId());
                 bom.setSubVersion(1);
             });
-            pbService.insertBatch(bomList);*/
+            pbService.insertBatch(bomList);
             // -> bom_his
             List<ProductBomHistory> bomHistoryList = new LinkedList<>();
             bomList.forEach(bom->{
@@ -925,14 +924,13 @@
 
             productHistory.setEnabled(-1);
             phService.insertAndUpdateEnabled(productHistory);
-            // -> product 鐜版湁浜у搧鍜屼骇鍝乥om涓嶉渶瑕佹彃鍏�,浣嗘槸瑕佸仛鍒犻櫎鍘熸潵鐨勬棫鐗堟湰
+            // -> product 鐜版湁浜у搧鍜屼骇鍝乥om闇�瑕佹彃鍏�,version榛樿涓�-1,鍚屾椂瑕佸仛鍒犻櫎鍘熸潵鐨勬棫鐗堟湰
             product.setId(productHistory.getId());
             product.setCreateTime(date);
-            product.setVersion(nextVersion);
-            //deleteAndInsert(product);
-            delete(product);
+            product.setVersion(-1);
+            deleteAndInsert(product);
             // -> product_bom
-            /*List<ProductBom> productBomList = new LinkedList<>();
+            List<ProductBom> productBomList = new LinkedList<>();
             bomMaterialList.forEach(bomMaterial -> {
                 ProductBom bom = new ProductBom();
                 bom.setProductId(product.getId());
@@ -950,7 +948,7 @@
 
                 productBomList.add(bom);
             });
-            pbService.insertBatch(productBomList);*/
+            pbService.insertBatch(productBomList);
             // -> product_bom_history
             List<ProductBomHistory> bomHistoryList = new LinkedList<>();
             bomMaterialList.forEach(bomMaterial -> {

--
Gitblit v1.9.1