Browse Source

推送调整

huxy 1 year ago
parent
commit
f0929e02ec

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

@@ -2043,7 +2043,7 @@ public class SyPackingListTailoringController implements Job {
 				 }
 			 }
 		 }
-		 //boolean bool= syPackingListTailoringService.updateBatchById(listTailorings);
+		 boolean bool= syPackingListTailoringService.updateBatchById(listTailorings);
 		 log.info("listTailorings\n"+listTailorings);
 		 List<String> msgs=new ArrayList<>();
 		 List<String> errors=new ArrayList<>();

+ 7 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/PushJob.java

@@ -41,7 +41,7 @@ public class PushJob implements Job {
         //queryWrapper.eq("id","c1429fecbedf49c6a8834957bae60595");
         //queryWrapper.eq("ready_Fabric","成衣");
         //queryWrapper.last("limit 2");
-      //  queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().like("recording_Error","超时"))) ;//推送中
+        //queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().like("recording_Error","超时"))) ;//推送中
         //queryWrapper.ne("time_Stuta",2);
         //queryWrapper.last("limit 3");
         UpdateWrapper updateWrapper=new UpdateWrapper();
@@ -50,9 +50,11 @@ public class PushJob implements Job {
         for (SyShippingOrder order : orderList){
             orderIds.add(order.getId());
         }
-        updateWrapper.in("id",orderIds);
-        updateWrapper.set("time_Stuta","4");
-        syShippingOrderMapper.update(null,updateWrapper);
+        if(orderIds.size()>0){
+            updateWrapper.in("id",orderIds);
+            updateWrapper.set("time_Stuta","4");
+            syShippingOrderMapper.update(null,updateWrapper);
+        }
         System.out.println("orderList.size\t"+orderList.size());
         for (SyShippingOrder order : orderList){
             Map<String,Object> codeMaps=new HashMap<>();
@@ -73,7 +75,7 @@ public class PushJob implements Job {
                 String names=codeMaps.get("error").toString();
                 order.setFailMesage(names.substring(1,names.length()-1));
             }
-            //syShippingOrderMapper.updateById(order);
+            syShippingOrderMapper.updateById(order);
             //codeMaps.put(order.getId(),message);
         }
         long endTime = System.currentTimeMillis();