From 6cde6bc12ebb814de85cd0e389ffc7e3869818fb Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 07 九月 2022 17:44:02 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/ProductService.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index ac9c9d0..13fe381 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -336,16 +336,18 @@
mpList = mphService.getListWithMaterialInfo(mpList);
List<String> newBomMaterialStrList = bomList.stream().map(bom -> bom.getSubCode() + "/" + bom.getSubModel()).collect(Collectors.toList());
mpList = mpList.stream().filter(mp -> newBomMaterialStrList.contains(mp.getSubMaterial().getSubCode() + "/" + mp.getSubMaterial().getSubModel())).collect(Collectors.toList());
- if (latestProduct.getVersion().intValue() == enabledProduct.getVersion()) {
- //鏈�鏂扮増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰杩炵潃鐨�
- mphService.updateVersionBatch(mpList);
- } else {
- //鏃х増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰涓嶈繛鐫�
- mpList.forEach(mp -> {
- mp.setSVersion(nextVersion);
- mp.setEVersion(nextVersion);
- });
- mphService.insertBatch(mpList);
+ if(mpList.size()!=0) {
+ if (latestProduct.getVersion().intValue() == enabledProduct.getVersion()) {
+ //鏈�鏂扮増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰杩炵潃鐨�
+ mphService.updateVersionBatch(mpList);
+ } else {
+ //鏃х増鏈敓鏁�,鍏宠仈鍏崇郴鐗堟湰涓嶈繛鐫�
+ mpList.forEach(mp -> {
+ mp.setSVersion(nextVersion);
+ mp.setEVersion(nextVersion);
+ });
+ mphService.insertBatch(mpList);
+ }
}
}
}
@@ -521,10 +523,11 @@
//鐗╂枡琛ㄤ腑涓嶅瓨鍦ㄧ殑(渚濇嵁:鐗╂枡缂栫爜+鐗╂枡鍨嬪彿),鍒欐坊鍔犲埌鐗╂枡琛ㄤ腑鍘�(鍖呭惈product杩欎釜鐗╂枡)
List<Material> materialExistList = mService.getListByCodeAndModelList2(bomList);
- List<String> subCodeList = materialExistList.stream().map(Material::getSubCode).collect(Collectors.toList());
+ //List<String> subCodeList = materialExistList.stream().map(Material::getSubCode).collect(Collectors.toList());
+ List<String> subCodeList = materialExistList.stream().map(material -> material.getSubCode()+"/"+material.getSubModel()).collect(Collectors.toList());
List<Material> materialList = new LinkedList<>();
bomList.forEach(bom -> {
- if (!subCodeList.contains(bom.getSubCode())) {
+ if (!subCodeList.contains(bom.getSubCode()+"/"+bom.getSubModel())) {
Material material = new Material();
material.setCategory(bom.getCategory());
material.setCreateDate(bom.getCreateDate());
--
Gitblit v1.9.1