优化订单同步逻辑及环境配置

zhangc

2025-01-07 f48878cdae5652be9e8f1145eda84d2ca9ca0544

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

@@ -1,20 +1,17 @@
package com.zy.asrs.task;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
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.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.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;

@@ -40,6 +37,9 @@
    @Autowired
    private OrderDetlService orderDetlService;

    @Autowired
    private DocTypeService docTypeService;

    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog() {
        try {
@@ -49,14 +49,15 @@
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    //@Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(fixedDelay = 5000)
    //@Async("orderThreadPool")
    public void completeAndReport() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            for (Order order : orders) {
                //如果是加工单则进行判断
                //如果是调拨单则进行判断
                if (order.getDocType() == 33) {
                    //查询库存中是否存在该订单的物料信息，存在则不处理该订单
                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -74,16 +75,19 @@
                }
                ReturnT<String> result = orderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                    //log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                }
            }
        }
    }

    @Scheduled(cron = "* 0/5 * * * ? ")
    @Async("orderThreadPool")
    public void reportOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
    //@Scheduled(cron = "* 0/5 * * * ? ")
    //@Scheduled(cron = "0/30 * * * * ? ")
    @Scheduled(fixedDelay = 30000)
    //@Async("orderThreadPool")
    public synchronized void reportOrder() {
        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("docName", "银座采购入库单"));
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", docType.getDocId()).in("settle", 2, 4));
        orderList.forEach(order -> {
            orderSyncHandler.timelyStart(order);
        });
@@ -93,11 +97,12 @@
    /*
    定时查询状态为2.作业中的单据，检查是否完成
     */
    @Scheduled(cron = "0 */1 * * * ? ")
    //@Scheduled(cron = "0 */1 * * * ? ")
    @Scheduled(fixedDelay = 60000)
    public void completeOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
        orderList.forEach(order -> {
            orderService.checkComplete(order.getOrderNo(), null);
            orderService.checkComplete(order.getOrderNo(), order.getPltType());
        });
    }