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

zhangc

2025-01-07 f48878cdae5652be9e8f1145eda84d2ca9ca0544

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

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

@@ -3,12 +3,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.service.AgvLocDetlService;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
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;
@@ -38,6 +36,9 @@

    @Autowired
    private OrderDetlService orderDetlService;

    @Autowired
    private DocTypeService docTypeService;

    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog() {
@@ -85,7 +86,8 @@
    @Scheduled(fixedDelay = 30000)
    //@Async("orderThreadPool")
    public synchronized void reportOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
        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);
        });
@@ -98,11 +100,9 @@
    //@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 -> {
            if (order.getPltType() != null) {
                orderService.checkComplete(order.getOrderNo(), order.getPltType());
            }
            orderService.checkComplete(order.getOrderNo(), order.getPltType());
        });
    }


 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -65,7 +65,7 @@

    @Transactional
    public ReturnT<String> start(Order order) {
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单"));

        DocType docType = docTypeService.selectById(order.getDocType());
        if (!docNames.contains(docType.getDocName())) {
@@ -96,11 +96,11 @@
            return;
        }

        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单"));
        //List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单"));
        //List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));

        DocType docType = docTypeService.selectById(order.getDocType());
        if (docNames.contains(docType.getDocName())) {

        //if (docNames.contains(docType.getDocName())) {
            List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
            List<OrderDetl> report = new ArrayList<>();
            for (OrderDetl orderDetl : orderDetlList) {
@@ -145,7 +145,7 @@
                        orderDetlService.updateById(orderDetl);
                    }
                }
            }
           // }

        }
    }

 src/main/resources/application.yml

@@ -1,4 +1,4 @@
spring:
  profiles:
    #dev loc prod
    active: loc
    active: prod