From 1070bbc0a4a569203f6bd5537f9f69ceb8378105 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期六, 27 八月 2022 09:11:43 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 0f379c2..77cb381 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -153,17 +153,19 @@
Integer nextVersion = currentVersion + 1;
//浜у搧鐗╂枡鍏崇郴杩佺Щ
//鏌ヨ鐢熸晥鐗堟湰鐨勫叧鑱斿叧绯�
- List<MaterialProductHistory> mpList = mphService.getListByParentCodeAndCustomCodeAndVersion(parentCode, customCode, enabledProduct.getVersion());
- if(latestProduct.getVersion().intValue() == enabledProduct.getVersion()){
- //鏈�鏂扮増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰杩炵潃鐨�
- mphService.updateVersionBatch(mpList);
- }else{
- //鏃х増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰涓嶈繛鐫�
- mpList.forEach(mp->{
- mp.setSVersion(nextVersion);
- mp.setEVersion(nextVersion);
- });
- mphService.insertBatch(mpList);
+ if(latestProduct!=null &&enabledProduct!=null) {
+ List<MaterialProductHistory> mpList = mphService.getListByParentCodeAndCustomCodeAndVersion(parentCode, customCode, enabledProduct.getVersion());
+ if (latestProduct.getVersion().intValue() == enabledProduct.getVersion()) {
+ //鏈�鏂扮増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰杩炵潃鐨�
+ mphService.updateVersionBatch(mpList);
+ } else {
+ //鏃х増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰涓嶈繛鐫�
+ mpList.forEach(mp -> {
+ mp.setSVersion(nextVersion);
+ mp.setEVersion(nextVersion);
+ });
+ mphService.insertBatch(mpList);
+ }
}
//灏嗕骇鍝佹枃浠跺鍒惰嚦姝ｅ紡璺緞
--
Gitblit v1.9.1