接收云工厂功能修改

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

@@ -515,8 +515,13 @@ 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();
@@ -547,6 +552,7 @@ public class SyPackingListFabricController {
 					 }
 					 for(SyPackingListFabric syPackingListFabric : packingListFabrics){
 						if(syPackingListFabric==null||syPackingListFabric.getSyDeclarationElementsId()==null){
+							System.out.println("SyPackingListFabric\n"+syPackingListFabric);
 							result.setSuccess(false);
 							result.success("未获取到发运明细的id");
 							return result;

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);
 			}
 		}