面辅料接收云工厂推送

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -76,10 +76,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
         filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除
-        filterChainDefinitionMap.put("/scas/syCostAllocationSummary/**", "anon"); //成本分配汇总测试
-        filterChainDefinitionMap.put("/spapl/syPreAssembledPackingList/**", "anon"); //成本分配汇总测试
-        filterChainDefinitionMap.put("/scas/supplierCapacity/**", "anon"); //供应商产能报表测试
-        filterChainDefinitionMap.put("/scas/dyeLoss/**", "anon"); //染损报表测试
+        filterChainDefinitionMap.put("/splfi/syPackingListFabric/saveBath", "anon");//面辅料接收云工厂推送数据
         filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
         filterChainDefinitionMap.put("/sys/mLogin", "anon"); //登录接口排除
         filterChainDefinitionMap.put("/sys/logout", "anon"); //登出接口排除

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -520,7 +520,7 @@ public class SyPackingListFabricController {
 		 list.add(syPackingListFabric);
 		 Gson userGson = new GsonBuilder().create();
 		 JSONObject jsonObjec=new JSONObject();
-		 jsonObjec.put("splt", userGson.toJson(JSONObject.toJSON(list)));
+		 jsonObjec.put("splfi", userGson.toJson(JSONObject.toJSON(list)));
 		 return jsonObjec;
 	 }
 
@@ -537,11 +537,23 @@ public class SyPackingListFabricController {
 					 //获取对象
 					 JSONObject jsonObject = json.getJSONObject(i);
 					 //获取json名
-					 String spapl = jsonObject.get("splt").toString();
+					 String spapl = jsonObject.get("splfi").toString();
 					 //转list
-					 List<SyPackingListFabric> syPackingListTailorings=JSONObject.parseArray(spapl,SyPackingListFabric.class);
+					 List<SyPackingListFabric> packingListFabrics=JSONObject.parseArray(spapl,SyPackingListFabric.class);
+					 if(packingListFabrics==null){
+						 result.setSuccess(false);
+						 result.success("未接收到数据");
+						 return result;
+					 }
+					 for(SyPackingListFabric syPackingListFabric : packingListFabrics){
+						if(syPackingListFabric==null||syPackingListFabric.getSyDeclarationElementsId()==null){
+							result.setSuccess(false);
+							result.success("未获取到发运明细的id");
+							return result;
+						}
+					 }
 					 //生成数据
-					 syPackingListFabricService.saveList(syPackingListTailorings);
+					 syPackingListFabricService.saveList(packingListFabrics);
 				 }
 				 result.setSuccess(true);
 				 result.success("操作成功");
@@ -559,10 +571,9 @@ public class SyPackingListFabricController {
 	 @ApiOperation(value="导出测试", notes="导出测试")
 	 @RequestMapping(value = "/exportXls")
 	 public Result<SyPackingListFabric> exportXls(HttpServletRequest request,HttpServletResponse response,SyPackingListFabric syPackingListFabric) {
-		 System.out.println("访问接口");
 		 long startTime = System.currentTimeMillis();
 		 /*要计算的程序部分*/
-		/* SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
+		 /* SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
 		 if(oConvertUtils.isNotEmpty(id)){
 			 syPackingListFabric.setId(id);
 		 }*/