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

whycq

2024-07-03 2ee70a38e4c832e3888b12d29ebf962456069cdb

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

@@ -43,11 +43,12 @@
        }
    }

//    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if (!erpEnable) return;
        String erpReport = Parameter.get().getErpReport();
//        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            for (Order order : orders) {