1

zhang

2 天以前 bae4b94d9d30aab92fb86a302240f257bd7e0d99

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

@@ -3,20 +3,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.core.common.DateUtils;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**
@@ -30,6 +31,15 @@
    private OrderSyncHandler orderSyncHandler;
    @Autowired
    private OrderService orderService;


    @Autowired
    private OrderLogService orderLogService;

    @Autowired
    private OrderDetlLogService orderDetlLogService;


    @Autowired
    private ApiLogService apiLogService;

@@ -45,9 +55,12 @@
    @Autowired
    private DocTypeService docTypeService;

    @Autowired
    private AgvWrkDetlService agvWrkDetlService;

    private Integer page = 1;

    private Integer size = 200;
    private Integer size = 500;

    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog() {
@@ -59,7 +72,7 @@
    }

    //@Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(fixedDelay = 600000)
    //@Scheduled(fixedDelay = 600000)
    //@Async("orderThreadPool")
    public void completeAndReport() {
        String erpReport = Parameter.get().getErpReport();
@@ -73,7 +86,7 @@
                    Boolean flag = false;
                    for (OrderDetl orderDetl : orderDetlList) {
                        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
                        if (!Cools.isEmpty(agvLocDetls)) {
                        if (!Cools.isEmpty(agvLocDetls) ) {
                            //只要有一项订单明细存在，则标识为true，跳过该订单
                            flag = true;
                        }
@@ -92,7 +105,7 @@

    //@Scheduled(cron = "* 0/5 * * * ? ")
    //@Scheduled(cron = "0/30 * * * * ? ")
    @Scheduled(fixedDelay = 30000)
    //@Scheduled(fixedDelay = 30000)
    //@Async("orderThreadPool")
    public synchronized void reportOrder() {
        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "银座采购入库单"));
@@ -109,24 +122,29 @@
    定时查询状态为2.作业中的单据，检查是否完成
     */
    //@Scheduled(cron = "0 */1 * * * ? ")
    @Scheduled(fixedDelay = 120000)
    @Scheduled(fixedDelay = 300000)
    public void completeOrder() {
        try {
            Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
            if (settle != null) {
                List<Order> orderList = settle.getRecords();
                if (orderList == null || orderList.isEmpty()) {
                    log.info("轮询完毕，{},{}", page, settle.getTotal());
                    page = 1;
                    return;
        Calendar calendar = Calendar.getInstance();
        int i = calendar.get(Calendar.HOUR);
        if (i >= 23 || i < 7){
            try {
                Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
                if (settle != null) {
                    List<Order> orderList = settle.getRecords();
                    if (orderList == null || orderList.isEmpty()) {
                        log.info("轮询完毕，{},{}", page, settle.getTotal());
                        page = 1;
                        return;
                    }
                    orderList.forEach(order -> {
                        orderService.checkComplete2(order.getOrderNo());
                    });
                }
                orderList.forEach(order -> {
                    orderService.checkComplete2(order.getOrderNo());
                });
            } finally {
                page++;
            }
        } finally {
            page++;
        }
    }


}