推送调整

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

@@ -1073,7 +1073,7 @@ public class SyPackingListFabricController implements Job {
 	 public void execute(JobExecutionContext context) throws JobExecutionException {
 
 		 QueryWrapper<SyPackingListFabric> queryWrapper=new QueryWrapper();
-		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().eq("recording_Error","超时"))) ;//推送中
+		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().like("recording_Error","超时"))) ;//推送中
 		 //queryWrapper.or();
 		 //queryWrapper.like();//超时
 	 	 List<SyPackingListFabric> syPackingListFabrics=syPackingListFabricService.list(queryWrapper);//修改调整

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

@@ -1334,7 +1334,7 @@ public class SyPackingListTailoringController implements Job {
 	 @Override
 	 public void execute(JobExecutionContext context) throws JobExecutionException {
 		 QueryWrapper <SyPackingListTailoring> queryWrapper=new QueryWrapper();
-		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().eq("recording_Error","超时"))) ;//推送中
+		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().like("recording_Error","超时"))) ;//推送中
 		/* queryWrapper.eq("push_State","3");//推送中
 		 queryWrapper.or();
 		 queryWrapper.like("recording_Error","超时");//超时*/
@@ -1363,7 +1363,7 @@ public class SyPackingListTailoringController implements Job {
 				 }
 				 Map<String,Object> map=new HashMap<>();
 				 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(id);
-				 //System.out.println("madate\t"+mapdate);
+				 System.out.println("madate\t"+mapdate);
 				 if(mapdate!=null){
 					 if(!mapdate.containsKey("e4")||mapdate.get("e4").equals("0")){
 						 message2="请先提交托书再推送";

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

@@ -1506,9 +1506,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						}
 					case "2":
 						text(mapList3,"销售发货单");
-						if(true){
-							throw new JeecgBootException("账套102接口销售发货单,原因错误：未设置对象变量或 With block 变量");
-						}
 						JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 						recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
 						maps.get(account).put("code",resturn3.getJSONObject(0).get("U8ReceiptNo").toString());