#

lsh

2025-02-28 edbc6bb56eb8e03061b05e9194d6464eb3664700

#

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

@@ -10,6 +10,7 @@
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -29,6 +30,9 @@
    private OrderService orderService;
    @Autowired
    private ApiLogService apiLogService;

    @Value("${erp.switch.ErpReportOld}")
    private boolean ErpReportOld;

    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog() {
@@ -97,9 +101,12 @@
//        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderReport() {
        if (!ErpReportOld){
            return;
        }
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();

 src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java

@@ -1,6 +1,8 @@
package com.zy.asrs.task.kingdee;

import com.core.common.Cools;
import com.zy.asrs.task.kingdee.handler.InboundOrderHandler;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -21,7 +23,10 @@
        if(!InboundOrderSwitch){
            return;
        }
        inboundOrderHandler.start();
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            inboundOrderHandler.start();
        }
    }

}

 src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java

@@ -1,6 +1,8 @@
package com.zy.asrs.task.kingdee;

import com.core.common.Cools;
import com.zy.asrs.task.kingdee.handler.LoginAuthenticationHandler;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +22,9 @@
        if(!LoginAuthenticationSwitch){
            return;
        }
        loginAuthenticationHandler.start();
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            loginAuthenticationHandler.start();
        }
    }
}

 src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java

@@ -1,11 +1,13 @@
package com.zy.asrs.task.kingdee;

import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.kingdee.handler.ReviewOrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -36,12 +38,15 @@
        if(!ReviewOrderSwitch){
            return;
        }
//        List<Order> orders = orderService.selectComplete();
        List<Order> orders = OrderInAndOutUtil.selectComplete(null);
        for (Order order : orders) {
            ReturnT<String> result = reviewOrderSyncHandler.start(order);
            if (!result.isSuccess()) {
                log.error("单据[orderNo={}]向erp审核失败", order.getOrderNo());
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            //        List<Order> orders = orderService.selectComplete();
            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
            for (Order order : orders) {
                ReturnT<String> result = reviewOrderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]向erp审核失败", order.getOrderNo());
                }
            }
        }
    }

 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java

@@ -1,10 +1,12 @@
package com.zy.asrs.task.kingdee;

import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -36,12 +38,15 @@
        if(!ReviewOrderSwitch){
            return;
        }
//        List<Order> orders = orderService.selectComplete8();
        List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
        for (Order order : orders) {
            ReturnT<String> result = submitOrderSyncHandler.start(order);
            if (!result.isSuccess()) {
                log.error("单据[orderNo={}]提交至erp失败", order.getOrderNo());
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            //        List<Order> orders = orderService.selectComplete8();
            List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
            for (Order order : orders) {
                ReturnT<String> result = submitOrderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]提交至erp失败", order.getOrderNo());
                }
            }
        }
    }

 src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java

@@ -1,5 +1,6 @@
package com.zy.asrs.task.kingdee;

import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
@@ -8,6 +9,7 @@
import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -38,12 +40,15 @@
        if(!ReviewOrderSwitch){
            return;
        }
//        List<Order> orders = orderService.selectComplete8();
        List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
        for (Order order : orders) {
            ReturnT<String> result = saveOrderSyncHandler.start(order);
            if (!result.isSuccess()) {
                log.error("单据[orderNo={}]保存至erp失败", order.getOrderNo());
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            //        List<Order> orders = orderService.selectComplete8();
            List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
            for (Order order : orders) {
                ReturnT<String> result = saveOrderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]保存至erp失败", order.getOrderNo());
                }
            }
        }
    }

 src/main/resources/application.yml

@@ -81,6 +81,8 @@
erp:
  #  开关
  switch:
    #计时器上报开关
    ErpReportOld: false
    #获取单据开关
    InboundOrderSwitch: false
    #登录接口开关