工单相关功能完善

pang.jiabao

2 天以前 6cd08fe4de88df0a21851f96bdc4e617c5d92e36

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

@@ -1,19 +1,24 @@
package com.zy.asrs.task;

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.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
import com.zy.asrs.task.handler.OrderPakinSyncHandler;
import com.zy.asrs.task.handler.OrderPakoutSyncHandler;
import com.zy.system.timer.LoadingConfigTimer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

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

/**
@@ -24,11 +29,24 @@
public class OrderSyncScheduler {

    @Autowired
    private OrderSyncHandler orderSyncHandler;
    private OrderPakinSyncHandler orderPakinSyncHandler;
    @Autowired
    private OrderService orderService;
    private OrderPakoutSyncHandler orderPakoutSyncHandler;
    @Autowired
    private OrderPakinService orderPakinService;
    @Autowired
    private OrderPakoutService orderPakoutService;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private LoadingConfigTimer loadingConfigTimer;

    @Resource
    private OrderDetlPakoutService orderDetlPakoutService;

    @Resource
    private OrderDetlPakinService orderDetlPakinService;


    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog() {
@@ -39,80 +57,67 @@
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    /**
     * 定时上报已入库的订单数量
     */
//    @Scheduled(cron = "0 0/5 * * * ?")
    @Scheduled(cron = "0 0/1 * * * ?")
    @Async("orderThreadPool")
    public void completeAndReportOrderIssuedOnceMore() {
        List<Order> orderList = orderService.selectComplete99();
        for (Order order : orderList) {
            try {
                ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]再次转执行表失败", order.getOrderNo());
                }
            } catch (Exception e){
                log.error(e.getMessage());
                log.error("单据[orderNo={}]再次转执行表失败", order.getOrderNo());
    public void reportInStockOrders() {
        if (loadingConfigTimer.getErpReport()) {
            List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().where("qty > units"));
            if (!orderDetlPakinList.isEmpty()) {
                orderPakinSyncHandler.reportInStockOrders(orderDetlPakinList);
            }
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    /**
     * 定时上报已出库的订单数量，定时任务5分钟上报一次，出入库错开上报
     */
//    @Scheduled(cron = "0 3/5 * * * ?")
    @Scheduled(cron = "0/10 * * * * ?")
    @Async("orderThreadPool")
    public void completeAndReportOrderIssued() {
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orderList = orderService.selectComplete1();
//            List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
            for (Order order : orderList) {
                try {
                    ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
                    if (!result.isSuccess()) {
                        log.error("单据[orderNo={}]转执行表失败", order.getOrderNo());
                    }
                } catch (Exception e){
                    log.error(e.getMessage());
                    log.error("单据[orderNo={}]转执行表失败", order.getOrderNo());
                }
    public void reportOutStockOrders() {
        if (loadingConfigTimer.getErpReport()) {
            List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().where("qty > units"));
            if (!orderDetlPakoutList.isEmpty()) {
                orderPakoutSyncHandler.reportOutStockOrders(orderDetlPakoutList);
            }
//        }
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    /**
     * 订单已完成，上报已完成，订单状态变已上报
     */
    @Scheduled(cron = "0 * * * * ?")
    @Async("orderThreadPool")
    public void completeAndReportOrderInAndOutUtil() {
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
            for (Order order : orders) {
                try {
                    ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
                    if (!result.isSuccess()) {
                        log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
                    }
                } catch (Exception e){
                    log.error(e.getMessage());
                    log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
                }
            }
//        }
    public void completeOrderReport() {
        // 入库订单已完成转已上报
        orderPakinSyncHandler.completeOrderReport();
        // 出库订单已完成转已上报
        orderPakoutSyncHandler.completeOrderReport();
    }

    @Scheduled(cron = "0/5 * * * * ? ")
//    @Scheduled(cron = "0/15 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderReport() {
        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());
                }
    public void completeOrderPakin() {
        if (loadingConfigTimer.getErpReport()) {
            List<OrderPakin> orders = orderPakinService.selectComplete();
            for (OrderPakin order : orders) {
                orderPakinSyncHandler.startOrderReport(order);
            }
        }
    }


//    @Scheduled(cron = "0/15 * * * * ? ")
    @Async("orderThreadPool")
    public void completeOrderPakout() {
        if (loadingConfigTimer.getErpReport()) {
            List<OrderPakout> orders = orderPakoutService.selectComplete();
            for (OrderPakout order : orders) {
                orderPakoutSyncHandler.startOrderReport(order);
            }
        }
    }