excel、推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1157,7 +1157,11 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 }
             }
         }else{
-            queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
+            if(ids==null){
+                queryWrapper.in("a.id",syPreAssembledPackingListVo.getId());//查询列表
+            }else{
+                queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
+            }
         }
         Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();

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

@@ -147,13 +147,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			maps.put(item.getGroupId(),item);//
 		}
 		for (SyPreAssembledPackingListItem item2 : items){
-			System.out.println("item2.getgroupid\t"+item2.getGroupId());
 			 if(maps.containsKey(item2.getGroupId())){//有这个分组id
 				 SyPreAssembledPackingListItem item=item2;
 				 SyPreAssembledPackingListItem item4=maps.get(item.getGroupId());
-				 System.out.println("item4.getUnitPrice()\t"+item4.getUnitPrice());
-				 System.out.println("item.getUnitPrice()\t"+item.getUnitPrice());
-				 System.out.println("item4.getUnitPrice().equals(item.getUnitPrice())\t"+(item4.getUnitPrice().equals(item.getUnitPrice())));
 				 if (item4.getUnitPrice().equals(item.getUnitPrice())){
 					 item.setCustomsDeclarationUnitPrice(item.getUnitPrice());
 				 }

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

@@ -1274,7 +1274,7 @@ public class SyPackingListFabricController implements Job {
 				 .like("recording_Error","超时").or().eq("recording_Error","null")
 				 .or().eq("recording_Error","nullnull")
 				 .or().like("recording_Error","For input string:")
-				 .or().eq("recording_Error","nullnullnull"))) ;//推送中
+				 .or().eq("recording_Error","nullnullnull").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

@@ -1352,7 +1352,7 @@ public class SyPackingListTailoringController implements Job {
 				 .like("recording_Error","超时").or().eq("recording_Error","null")
 				 .or().eq("recording_Error","nullnull")
 				 .or().like("recording_Error","For input string:")
-				 .or().eq("recording_Error","nullnullnull"))) ;//推送中
+				 .or().eq("recording_Error","nullnullnull").or().like("recording_Error","未能捕获到的错误"))) ;//推送中
 		/* queryWrapper.eq("push_State","3");//推送中
 		 queryWrapper.or();
 		 queryWrapper.like("recording_Error","超时");//超时*/