0421

src/main/java/cn/ezhizao/project/business/controller/BizProductAccessoriesMaterialController.java

@@ -553,13 +553,13 @@ public class BizProductAccessoriesMaterialController extends BaseController
                             }
                         }
                     }
-                        List<BizProduct> productList = bizProductService.query().in("id", productCollect.stream()
-                                .map(BizProductAccessoriesMaterial::getId)
+                        List<BizProduct> productList = bizProductService.query().in("product_code", productCollect.stream()
+                                .map(BizProductAccessoriesMaterial::getHistoryProductCode)
                                 .collect(Collectors.toList())).list();
                         for (BizProductAccessoriesMaterial product : productCollect) {
                             BizProduct bizProduct  = productList.stream().filter(item->item.getId().equals(product.getId())).findFirst().orElse(null);
                             if (bizProduct == null) {
-                                throw new RuntimeException("修改失败,产品id不存在");
+                                throw new RuntimeException("修改失败,产品编码不存在");
                             }
                             if (product.getTenantId() != null) {
                                 bizProduct.setTenantId(product.getTenantId());
@@ -709,13 +709,13 @@ public class BizProductAccessoriesMaterialController extends BaseController
                             }
                         }
                     }
-                    List<BizAccessories> accesoriesList = bizAccessoriesService.query().in("id", accessoriesCollect.stream()
-                            .map(BizProductAccessoriesMaterial::getId)
+                    List<BizAccessories> accesoriesList = bizAccessoriesService.query().in("accessories_code", accessoriesCollect.stream()
+                            .map(BizProductAccessoriesMaterial::getHistoryAccessoriesCode)
                             .collect(Collectors.toList())).list();
                     for (BizProductAccessoriesMaterial accessories : accessoriesCollect) {
                         BizAccessories bizAccessories  = accesoriesList.stream().filter(item->item.getId().equals(accessories.getId())).findFirst().orElse(null);
                         if (bizAccessories == null) {
-                            throw new RuntimeException("修改失败,辅料id不存在");
+                            throw new RuntimeException("修改失败,辅料编码不存在");
                         }
                         if (accessories.getAccessoriesCode() != null) {
                             bizAccessories.setAccessoriesCode(accessories.getAccessoriesCode());
@@ -852,13 +852,13 @@ public class BizProductAccessoriesMaterialController extends BaseController
                             }
                         }
                     }
-                    List<BizMaterialBase> materialList = bizMaterialBaseService.query().in("id", materialCollect.stream()
-                            .map(BizProductAccessoriesMaterial::getId)
+                    List<BizMaterialBase> materialList = bizMaterialBaseService.query().in("material_code", materialCollect.stream()
+                            .map(BizProductAccessoriesMaterial::getHistoryMaterialCode)
                             .collect(Collectors.toList())).list();
                     for (BizProductAccessoriesMaterial material : materialCollect) {
                         BizMaterialBase bizMaterialBase  = materialList.stream().filter(item->item.getId().equals(material.getId())).findFirst().orElse(null);
                         if (bizMaterialBase == null) {
-                            throw new RuntimeException("修改失败,原材料id不存在");
+                            throw new RuntimeException("修改失败,原材料编码不存在");
                         }
 
                         if (material.getMaterialCode() != null) {