Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

2025-12-29 43f9cf624b83c9d3d0e2280a1404dcc52695a18d

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

@@ -118,6 +118,7 @@
                    if (!result.isSuccess()) {
                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                    }

                } catch (Exception e) {
                    log.error(e.getMessage());
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
@@ -128,7 +129,7 @@

    /**损溢单完结上报 */
    @Scheduled(cron = "0/30 * * * * ?")
    @Async("checkOrderThreadPool")
    @Async("orderThreadPool")
    public void completeCheckOrderReport() {
        if (!ErpReportOld){
            return;