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

1

22 小时以前 9126e6315288e1ea50e74c70b099974522d6b172

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

@@ -4,6 +4,7 @@
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.SaveOrderSyncHandler;
import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
@@ -24,28 +25,28 @@
public class SaveOrderSyncScheduler {

    @Autowired
    private SubmitOrderSyncHandler submitOrderSyncHandler;
    private SaveOrderSyncHandler saveOrderSyncHandler;
    @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 (1==1) return;
        if(!ReviewOrderSwitch){
            return;
        }
        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.selectComplete(null);
            List<Order> orders = orderService.selectComplete();

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