#

pang.jiabao

4 天以前 2dc12d419733c094bb0bbc7ef4f7a32d5067cfb9

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

@@ -2,8 +2,9 @@

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.entity.OrderPakin;
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -15,6 +16,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.List;

/**
@@ -30,6 +32,12 @@
    private OrderService orderService;
    @Autowired
    private ApiLogService apiLogService;
    @Resource
    private OrderPakinService orderPakinService;
    @Resource
    private OrderPakoutService orderPakoutService;
    @Resource
    private MesService mesService;

    @Value("${erp.switch.ErpReportOld}")
    private boolean ErpReportOld;
@@ -104,23 +112,43 @@
//    @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();
            for (Order order : orders) {
                try {
                    ReturnT<String> result = orderSyncHandler.startOrderReport(order);
                    if (!result.isSuccess()) {
                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                    }
                } catch (Exception e) {
                    log.error(e.getMessage());
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                }

        // 入库完成
        List<OrderPakin> pakins = orderPakinService.selectComplete();
        for (OrderPakin orderPakin : pakins) {
            try {
                 mesService.inFeedback(orderPakin.getOrderNo());
            } catch (Exception e) {
                log.error("推送入库完成信息错误, order{}", orderPakin, e);
            }
        }

        List<OrderPakout> pakouts = orderPakoutService.selectComplete();
        for (OrderPakout orderPakout : pakouts) {
            try {
                mesService.outFeedback(orderPakout.getOrderNo());
            } catch (Exception e) {
                log.error("推送出库完成信息错误, order{}", orderPakout, e);
            }
        }

//        if (!ErpReportOld){
//            return;
//        }
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
//            List<Order> orders = orderService.selectComplete();
//            for (Order order : orders) {
//                try {
//                    ReturnT<String> result = orderSyncHandler.startOrderReport(order);
//                    if (!result.isSuccess()) {
//                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
//                    }
//                } catch (Exception e) {
//                    log.error(e.getMessage());
//                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
//                }
//            }
//        }
    }
}