From 802572535e54d8aadf548353eeeb382000226b44 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 25 八月 2022 17:31:51 +0800
Subject: [PATCH] 物料-产品审批
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index e5c5ae6..bbfc99e 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -251,16 +251,26 @@
ProductHistory productHistory = new ProductHistory();
productHistory.setParentCode(parentCode);
productHistory.setParentName(productApproving.getParentName());
- productApproving.setParentModel(parentModel);
+ productHistory.setParentModel(parentModel);
productHistory.setNotes(productApproving.getNotes());
productHistory.setCustomCode(customCode);
productHistory.setCreateTime(new Date());
productHistory.setVersion(nextVersion);
productHistory.setEnabled(1);
+ Product productNew = new Product();
+ productNew.setParentCode(parentCode);
+ productNew.setParentName(productApproving.getParentName());
+ productNew.setParentModel(parentModel);
+ productNew.setNotes(productApproving.getNotes());
+ productNew.setCustomCode(customCode);
+ productNew.setCreateTime(new Date());
+ productNew.setVersion(nextVersion);
+
//瀹為檯鐢熸晥鐨勫彧鏈塱nsert,鍥犱负鐘舵�佽缃负鏈惎鐢ㄥ凡缁忓湪鎻愪氦瀹℃壒鏃跺彉鏇翠簡
phService.insertAndUpdateEnabled(productHistory);
- int productId = productService.updateVersion(parentCode,customCode,nextVersion);
+
+ productService.insert(productNew);
List<ProductBomHistory> productBomHistoryList = new LinkedList<>();
List<ProductBom> productBomList = new LinkedList<>();
@@ -268,7 +278,7 @@
ProductBomHistory bomHistory = new ProductBomHistory();
ProductBom bom = new ProductBom();
- bom.setProductId(productId);
+ bom.setProductId(productNew.getId());
bom.setCategory(approving.getCategory());
bom.setCreateDate(new Date());
bom.setDwgUrl(approving.getDwgUrl());
--
Gitblit v1.9.1