Merge remote-tracking branch 'origin/master'

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/capacity/entity/SyCapacityControl.java

@@ -34,7 +34,7 @@ public class SyCapacityControl implements Serializable {
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.String id;
+    private int id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
@@ -66,11 +66,11 @@ public class SyCapacityControl implements Serializable {
 	/**产能额度上浮区间*/
 	@Excel(name = "产能额度上浮区间", width = 15)
     @ApiModelProperty(value = "产能额度上浮区间")
-    private java.lang.String capacitySection;
+    private java.math.BigDecimal capacitySection;
 	/**供应商状态*/
 	@Excel(name = "供应商状态", width = 15)
     @ApiModelProperty(value = "供应商状态")
-    private java.lang.Integer supplierState;
+    private java.lang.String supplierState;
 	/**备注（用于填写红灯原因）*/
 	@Excel(name = "备注（用于填写红灯原因）", width = 15)
     @ApiModelProperty(value = "备注（用于填写红灯原因）")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/impl/SyCapacityControlServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.capacity.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import org.jeecg.modules.capacity.mapper.SyCapacityControlMapper;
 import org.jeecg.modules.capacity.service.ISyCapacityControlService;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@DS("multi-three")
 public class SyCapacityControlServiceImpl extends ServiceImpl<SyCapacityControlMapper, SyCapacityControl> implements ISyCapacityControlService {
 
 }

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

@@ -515,12 +515,17 @@ public class SyPackingListFabricController {
 		 SyPackingListFabric syPackingListFabric= syPackingListFabricService.getById(id);
 		 QueryWrapper queryWrapper=new QueryWrapper();
 		 queryWrapper.eq("sy_packing_list_fabric_id",id);
-		 List<SyPackingListFabricItem> item=syPackingListFabricItemService.list(queryWrapper);
-		 syPackingListFabric.setSyPackingListFabricItem(item);
+		 List<SyPackingListFabricItem> items=syPackingListFabricItemService.list(queryWrapper);
+		 for (SyPackingListFabricItem item : items){
+		 	item.setCreateTime(null);
+		 }
+		 System.out.println("items\n"+items);
+		 syPackingListFabric.setSyPackingListFabricItem(items);
+		 syPackingListFabric.setCreateTime(null);
 		 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 +542,24 @@ 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){
+							System.out.println("SyPackingListFabric\n"+syPackingListFabric);
+							result.setSuccess(false);
+							result.success("未获取到发运明细的id");
+							return result;
+						}
+					 }
 					 //生成数据
-					 syPackingListFabricService.saveList(syPackingListTailorings);
+					 syPackingListFabricService.saveList(packingListFabrics);
 				 }
 				 result.setSuccess(true);
 				 result.success("操作成功");
@@ -559,10 +577,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);
 		 }*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -486,8 +486,19 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Transactional
 	public void saveList(List<SyPackingListFabric> syPackingListTailorings) {
 		for (SyPackingListFabric syPackingListFabric : syPackingListTailorings){
+			SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
+			QueryWrapper<SyPackingListFabric> queryWrapperCount=new QueryWrapper<>();
+			queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
+			queryWrapperCount.eq("is_U8_Data","0");//判断是不是面料
+			queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
+			String dateNo ="ML"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
+			syPackingListFabric.setDocumentNo(dateNo);//单据号
+			syPackingListFabric.setStatus("0");
+			syPackingListFabric.setDelFlag("0");
 			syPackingListFabricMapper.insert(syPackingListFabric);
 			for (SyPackingListFabricItem s1 : syPackingListFabric.getSyPackingListFabricItem()) {
+				s1.setDelFlag("0");
+				s1.setSyPackingListFabricId(syPackingListFabric.getId());
 				syPackingListFabricItemMapper.insert(s1);
 			}
 		}