合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -72,14 +72,15 @@
                        continue;
                    }
                }
                ReturnT<String> result = orderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                }
//                ReturnT<String> result = orderSyncHandler.start(order);
//                if (!result.isSuccess()) {
//                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
//                }
            }
        }
    }

    //@Scheduled(cron = "* 0/5 * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void reportOrder() {