guoyujia hai 2 meses
pai
achega
e4256f6e8d

+ 3 - 3
src/main/java/cn/ezhizao/project/business/controller/BizProductAccessoriesMaterialController.java

@@ -557,7 +557,7 @@ public class BizProductAccessoriesMaterialController extends BaseController
                                 .map(BizProductAccessoriesMaterial::getHistoryProductCode)
                                 .map(BizProductAccessoriesMaterial::getHistoryProductCode)
                                 .collect(Collectors.toList())).list();
                                 .collect(Collectors.toList())).list();
                         for (BizProductAccessoriesMaterial product : productCollect) {
                         for (BizProductAccessoriesMaterial product : productCollect) {
-                            BizProduct bizProduct  = productList.stream().filter(item->item.getId().equals(product.getId())).findFirst().orElse(null);
+                            BizProduct bizProduct  = productList.stream().filter(item->item.getProductCode().equals(product.getHistoryProductCode())).findFirst().orElse(null);
                             if (bizProduct == null) {
                             if (bizProduct == null) {
                                 throw new RuntimeException("修改失败,产品编码不存在");
                                 throw new RuntimeException("修改失败,产品编码不存在");
                             }
                             }
@@ -713,7 +713,7 @@ public class BizProductAccessoriesMaterialController extends BaseController
                             .map(BizProductAccessoriesMaterial::getHistoryAccessoriesCode)
                             .map(BizProductAccessoriesMaterial::getHistoryAccessoriesCode)
                             .collect(Collectors.toList())).list();
                             .collect(Collectors.toList())).list();
                     for (BizProductAccessoriesMaterial accessories : accessoriesCollect) {
                     for (BizProductAccessoriesMaterial accessories : accessoriesCollect) {
-                        BizAccessories bizAccessories  = accesoriesList.stream().filter(item->item.getId().equals(accessories.getId())).findFirst().orElse(null);
+                        BizAccessories bizAccessories  = accesoriesList.stream().filter(item->item.getAccessoriesCode().equals(accessories.getHistoryAccessoriesCode())).findFirst().orElse(null);
                         if (bizAccessories == null) {
                         if (bizAccessories == null) {
                             throw new RuntimeException("修改失败,辅料编码不存在");
                             throw new RuntimeException("修改失败,辅料编码不存在");
                         }
                         }
@@ -856,7 +856,7 @@ public class BizProductAccessoriesMaterialController extends BaseController
                             .map(BizProductAccessoriesMaterial::getHistoryMaterialCode)
                             .map(BizProductAccessoriesMaterial::getHistoryMaterialCode)
                             .collect(Collectors.toList())).list();
                             .collect(Collectors.toList())).list();
                     for (BizProductAccessoriesMaterial material : materialCollect) {
                     for (BizProductAccessoriesMaterial material : materialCollect) {
-                        BizMaterialBase bizMaterialBase  = materialList.stream().filter(item->item.getId().equals(material.getId())).findFirst().orElse(null);
+                        BizMaterialBase bizMaterialBase  = materialList.stream().filter(item->item.getMaterialCode().equals(material.getHistoryMaterialCode())).findFirst().orElse(null);
                         if (bizMaterialBase == null) {
                         if (bizMaterialBase == null) {
                             throw new RuntimeException("修改失败,原材料编码不存在");
                             throw new RuntimeException("修改失败,原材料编码不存在");
                         }
                         }