添加库位规则查找，优化自动移动逻辑

zhangc

2025-01-20 37f55514ad2f02397fd75c7d98cea25e371243c7

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

@@ -1,11 +1,13 @@
package com.zy.asrs.task;

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.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -38,7 +40,14 @@
    private OrderDetlService orderDetlService;

    @Autowired
    private OrderDetlMapper orderDetlMapper;

    @Autowired
    private DocTypeService docTypeService;

    private Integer page = 1;

    private Integer size = 100;

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

    //@Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(fixedDelay = 5000)
    @Scheduled(fixedDelay = 600000)
    //@Async("orderThreadPool")
    public void completeAndReport() {
        String erpReport = Parameter.get().getErpReport();
@@ -87,10 +96,12 @@
    //@Async("orderThreadPool")
    public synchronized void reportOrder() {
        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "银座采购入库单"));
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", docType.getDocId()).in("settle", 2, 4));
        orderList.forEach(order -> {
            orderSyncHandler.timelyStart(order);
        });
        if (docType != null) {
            List<String> reportDetl = orderDetlMapper.getReportDetl(docType.getDocId());
            reportDetl.forEach(orderNo -> {
                orderSyncHandler.timelyStart(orderService.selectByNo(orderNo));
            });
        }
    }


@@ -100,10 +111,22 @@
    //@Scheduled(cron = "0 */1 * * * ? ")
    @Scheduled(fixedDelay = 60000)
    public void completeOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
        orderList.forEach(order -> {
            orderService.checkComplete(order.getOrderNo(), order.getPltType());
        });
        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());
                });
            }
        } finally {
            page++;
        }
    }

}