From fd155e1ccdcf5f558dc701420658af17799eff5e Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 13 三月 2023 10:56:46 +0800
Subject: [PATCH] Revert "重大更新:相同编码和型号,如果类别不同,区别为不同物料.处理方式为:型号内追加类别,最终以不同型号处理区分物料. 不影响 编码和型号确定唯一物料这一基本规则前提下区分类别不同的同编码和型号的物料"
---
src/main/java/com/whyc/service/ProductService.java | 61 ------------------------------
1 files changed, 1 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index b0600dd..f184bf2 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -288,51 +288,6 @@
}
bomList.add(bom);
}
- //浜х敓鐨刡om鐗╂枡鍒楄〃,鏌ヨ鏄惁鏈� 鐩稿悓缂栫爜鍜屽瀷鍙风殑
- List<Material> existMaterialListWithSameSubCodeAndModel = mService.getSameSubCodeAndModel(bomList);
- List<String> dbCodeModelUnionList = existMaterialListWithSameSubCodeAndModel.stream().map(material -> material.getSubCode() + "/" + (material.getSubModel().contains("-[绯荤粺杩藉姞-")?material.getSubModel().split("-\\[绯荤粺杩藉姞-")[0]:material.getSubModel())).collect(Collectors.toList());
- //List<String> dbCodeOriginalModelUnionList = existMaterialListWithSameSubCodeAndModel.stream().map(material -> material.getSubCode() + "/" + material.getSubModel()).collect(Collectors.toList());
- List<String> dbCodeModelCategoryUnionList = existMaterialListWithSameSubCodeAndModel.stream().map(material -> material.getSubCode() + "/" + (material.getSubModel().contains("-[绯荤粺杩藉姞-")?material.getSubModel().split("-\\[绯荤粺杩藉姞-")[0]:material.getSubModel())+"/"+material.getCategory()).collect(Collectors.toList());
- List<String> dbCodeOriginalModelCategoryUnionList = existMaterialListWithSameSubCodeAndModel.stream().map(material -> material.getSubCode() + "/" + material.getSubModel()+"/"+material.getCategory()).collect(Collectors.toList());
- bomList.forEach(bom->{
- //鍚岀紪鐮佸拰鍨嬪彿
- String codeModelUnionStr = bom.getSubCode() + "/" + bom.getSubModel();
- if(dbCodeModelUnionList.contains(codeModelUnionStr)){
- String codeModelCategoryUnionStr = bom.getSubCode() + "/" + bom.getSubModel() + "/" + bom.getCategory();
- if(dbCodeModelCategoryUnionList.contains(codeModelCategoryUnionStr)){
- //鐩稿悓绫诲埆,瀹屽叏鐩稿悓. 鍨嬪彿闇�瑕佷笌鏁版嵁搴撳唴璁板綍鐨勫鐞嗕繚鎸佷竴鑷�
- if(!dbCodeOriginalModelCategoryUnionList.contains(codeModelCategoryUnionStr)){
- bom.setSubModel(bom.getSubModel()+"-[绯荤粺杩藉姞-"+bom.getCategory()+"]");
- }
- }else{ //涓嶅悓绫诲埆
- //閲嶅啓鍨嬪彿
- bom.setSubModel(bom.getSubModel()+"-[绯荤粺杩藉姞-"+bom.getCategory()+"]");
- }
- }
- });
- //涓婁紶鐨刡om鐗╂枡鍒楄〃鑷繁瀵规瘮,鏍￠獙鏄惁 [缂栧彿/鍨嬪彿鐩稿悓]鍙奫缂栧彿/鍨嬪彿,绫诲埆鐩稿悓]
- List<ProductBom> reviewedBomList = new LinkedList<>();
- for (int i1 = 0; i1 < bomList.size(); i1++) {
- ProductBom bom = bomList.get(i1);
- for (int j = 0; j < reviewedBomList.size(); j++) {
- ProductBom reviewedBom = reviewedBomList.get(j);
- if((reviewedBom.getSubCode()+"/"+reviewedBom.getSubModel()).equals(bom.getSubCode()+"/"+bom.getSubModel())){
- //宸茬粡閬嶅巻鐨勮褰曚腑,涓庡綋鍓嶆鍦ㄩ亶鍘嗙殑璁板綍 缂栧彿/鍨嬪彿鐩稿悓
- if((reviewedBom.getSubCode()+"/"+reviewedBom.getSubModel()+"/"+reviewedBom.getCategory())
- .equals(bom.getSubCode()+"/"+bom.getSubModel()+"/"+bom.getCategory())){
- //绫诲埆鐩稿悓
- return response.set(1,false,"瑙ｆ瀽澶辫触,鍘熷洜:瀛樺湪涓や釜瀹屽叏鐩稿悓鐨勭墿鏂�-瀛愪欢缂栫爜"+bom.getSubCode()+"/瀛愪欢鍨嬪彿"+bom.getSubModel()+"/绫诲埆"+reviewedBom.getCategory());
- }else{
- //绫诲埆涓嶅悓,鍨嬪彿鍐呯郴缁熼粯璁よ拷鍔犵被鍒�
- bomList.get(j).setSubModel(reviewedBom.getSubModel()+"-[绯荤粺杩藉姞-"+reviewedBom.getCategory()+"]");
- bomList.get(i1).setSubModel(bom.getSubModel()+"-[绯荤粺杩藉姞-"+bom.getCategory()+"]");
- }
- }
- }
- //閬嶅巻涓�涓�,娣诲姞涓�涓埌reviewedBomList
- reviewedBomList.add(bom);
- }
-
product.setBomList(bomList);
}
}
@@ -669,7 +624,6 @@
material.setPictureUrl(bom.getPictureUrl());
// TODO 鏄惁瑕佹洿鏂板悓鐗╂枡缂栫爜鐨勮�佺墿鏂欑姸鎬佷负0?
material.setStatus(1);
- material.setCategory(bom.getCategory());
material.setSubCode(bom.getSubCode());
material.setSubModel(bom.getSubModel());
material.setSubName(bom.getSubName());
@@ -714,20 +668,7 @@
// product鐨勪富閿部鐢ㄥ搴攑roduct_history鐨�
//鏍规嵁缂栫爜鍜屽瀷鍙风‘瀹氱墿鏂檌d骞跺搴攓uantity,瀛樺叆鏁版嵁搴�.
//List<Material> bomMaterialList = mService.getListByCodeAndModelList2(bomList);
- //List<ProductBom> bomMaterialList = pbService.getListByCodeAndModelList2(bomList);
- List<Material> existMaterialListWithSameSubCodeAndModel = mService.getSameSubCodeAndModel(bomList);
- List<ProductBom> bomMaterialList;
- bomList.forEach(bom->{
- String codeModelUnionStr = bom.getSubCode() + "/" + bom.getSubModel();
- for (int i = 0; i < existMaterialListWithSameSubCodeAndModel.size(); i++) {
- Material materialExists = existMaterialListWithSameSubCodeAndModel.get(i);
- if(codeModelUnionStr.equals(materialExists.getSubCode() + "/" + materialExists.getSubModel())){
- bom.setId(materialExists.getId());
- break;
- }
- }
- });
- bomMaterialList = bomList;
+ List<ProductBom> bomMaterialList = pbService.getListByCodeAndModelList2(bomList);
// -> product_history
ProductHistory productHistory = new ProductHistory();
productHistory.setParentCode(product.getParentCode());
--
Gitblit v1.9.1