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

1

1 天以前 9126e6315288e1ea50e74c70b099974522d6b172

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

@@ -27,14 +27,14 @@
public class SubmitOrderSyncScheduler {

    @Autowired
    private SaveOrderSyncHandler saveOrderSyncHandler;
    private SubmitOrderSyncHandler submitOrderSyncHandler;
    @Autowired
    private OrderService orderService;

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

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if(!ReviewOrderSwitch){
@@ -42,10 +42,11 @@
        }
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            //        List<Order> orders = orderService.selectComplete8();
            List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
//            List<Order> orders = OrderInAndOutUtil.selectComplete10(null); //查询10新增上报完成
            List<Order> orders = orderService.selectComplete10();

            for (Order order : orders) {
                ReturnT<String> result = saveOrderSyncHandler.start(order);
                ReturnT<String> result = submitOrderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]保存至erp失败", order.getOrderNo());
                }