导入调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -763,6 +763,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		}
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.in("shipping_Details_Id",ids);
+		queryWrapper.in("del_flag",0);
 		List<SyShippingDetailsItem> syItems=syShippingDetailsItemMapper.selectList(queryWrapper);//获取数据
 		Map<String,SyShippingDetailsItem> mapItems=new HashMap<>();
 		Map<String,SyShippingDetailsItem> map=new HashMap<>();

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

@@ -1597,6 +1597,7 @@ public class SyPackingListFabricController implements Job {
 				 syPackingListFabricService.updateById(main);//修改成衣
 			 }
 			 List<SyPackingListFabricItem> items=syPackingListFabricItemService.selectByMainId3(ids);
+			 System.out.println("子表items.size\t"+items.size());
 			 Map<String,String> supperNames=new HashMap<>();
 			 for (SyPackingListFabricItem syPackingListFabricItem : items){
 			 	if(supperNames.containsKey(syPackingListFabricItem.getSupplier())){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -1782,6 +1782,10 @@ public class SyPackingListTailoringController implements Job {
 						message+=e.getMessage();
 					}
 				}
+				if (map.containsKey("error")&&map.get("error").toString().indexOf("10")>-1){
+					String error =map.get("error").toString();
+					log.info("成衣推送报错error\t"+error);
+				}
 			}
 			if(message!=null&&message.length()>0&&message.indexOf("接口")>-1){
 				main.setPushState("2");//推送失败！

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -1519,11 +1519,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 			if(mapt.get("customerCode").equals("T020001")&&!mapt.get("account").equals("101")){
 				mapt.put("account","101");//账套号
+				mapt.put("error","101账套未推送");
 			}else if(mapt.get("customerCode").equals("0001")&&!mapt.get("account").equals("102")){
 				map6.put("CTYPE","专用");//发票类型（普通，专用）
 				mapt.put("account","102");//账套号
+				mapt.put("error","102账套未推送");
 			}else{
 				mapt.put("account","104");//账套号
+				mapt.put("error","");
 			}
 			mapt.put("itemSort",mapSort);
 			System.out.println("获取循环后当前是第几个账套\t"+mapt.get("account"));