121

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/ProdProcedureController.java

@@ -49,10 +49,10 @@ public class ProdProcedureController {
      */
     @RequestMapping("/changeProdProcedure")
     public HttpRespMsg changeProdProcedure ( Integer productId ,String productName,String version, String  prodProcedures){
-
+        System.out.println(prodProcedures);
         List<ProdProcedure> prodProcedureList= null;
         prodProcedureList =Arrays.asList(JSONObject.parseObject(prodProcedures,ProdProcedure[].class));
-
+        System.out.println(prodProcedureList);
         return prodProcedureService.changeProdProcedure(request, prodProcedureList,productId,productName,version);
     }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdProcedureServiceImpl.java

@@ -151,8 +151,8 @@ public class ProdProcedureServiceImpl extends ServiceImpl<ProdProcedureMapper, P
                         .eq(user.getCompanyId() != null, ProdProcedure::getCompanyId, user.getCompanyId())
                         .eq(StringUtils.isNotBlank(version), ProdProcedure::getVersionNumber, version)
                         .eq(productId != null, ProdProcedure::getProductId, productId)
-
         );
+        System.out.println(prodProcedureList);
         httpRespMsg.data=prodProcedureList;
         return httpRespMsg;
     }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProductServiceImpl.java

@@ -432,7 +432,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                     return prodProcedure.getProductName().equals(procedure.getProductName()) && !prodProcedure.getVersionNumber().equals(procedure.getVersionNumber());
                 }).count()>0){
 
-                    msg.setError("一个产品只能导入一个产品号");
+                    msg.setError("一个产品只能导入一个版本号");
                     return msg;
                 }