Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -850,7 +850,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         ioCollectOrderBackupService.save(ioCollectOrderBackup);
         //todo 备份码表
         IoCollectOrder finalCollectOrder = collectOrder;
-        ThreadUtil.execAsync(() -> {
         //插入到码表
         collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
         //删除原来单据
@@ -858,14 +857,14 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         //更新数据至第三方系统
         //单据更新
 //                    ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);
-                    IoCollectSet ioCollectSet = collectSetService.getSet();
-                    Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
 
-                    if (autoUploadOrder) {
+        //不立马上传，等待定时器自动上传
-                        ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), authAdmin);
+//        IoCollectSet ioCollectSet = collectSetService.getSet();
-                    }
+//        Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
-                }
+//        if (autoUploadOrder) {
-        );
+//            ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), authAdmin);
+//        }
+
     }
 
     public void busGenOrder(CollectOrderRequest collectOrderRequest) {

src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java

@@ -76,7 +76,6 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
     }
 
     private void process() {
-        ThreadUtil.execAsync(() -> {
 
         //获取下载的起始时间
         IoCollectSet ioCollectSet = collectSetService.getSet();
@@ -110,7 +109,6 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
 //                collectSetService.updateById(ioCollectSet);
         }
 
-        });
     }
 
 }