From 9e7a4afa997d02df1846d7d51c5d3d6cbbeb48f8 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 07 九月 2022 16:38:44 +0800
Subject: [PATCH] 修复
---
src/main/java/com/whyc/service/ProductService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index fcf5eba..13fe381 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -523,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