优化定时任务及日志输出，调整订单同步逻辑

zhangc

2025-01-08 bcb6146f20a823861c15775ca8c396e6505035db

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

@@ -46,6 +46,15 @@
    private AgvWrkDetlLogService agvWrkDetlLogService;

    @Autowired
    private AgvWrkMastLogService agvWrkMastLogService;

    @Autowired
    private AgvLocMastService agvLocMastService;

    @Autowired
    private AgvWrkDetlLogService agvWrkDetlLogService;

    @Autowired
    private AgvWrkMastService agvWrkMastService;

    @Autowired
@@ -65,7 +74,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 +105,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) {
@@ -109,12 +118,14 @@
                }
            }
            if (Cools.isEmpty(order.getPltType())) {
                List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).eq("io_type", 1));
                List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).orderBy("appe_time", false));
                if (!Cools.isEmpty(agvWrkDetlLogs)) {
                    AgvWrkMast agvWrkMast = agvWrkMastService.selectById(agvWrkDetlLogs.get(0).getWrkNo());
                    if (agvWrkMast != null) {
                        AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
                    AgvWrkDetlLog agvWrkDetlLog = agvWrkDetlLogs.get(0);
                    List<AgvWrkMastLog> agvWrkMastLogs = agvWrkMastLogService.selectList(new EntityWrapper<AgvWrkMastLog>().eq("wrk_no", agvWrkDetlLog.getWrkNo()).eq("io_type", 1).orderBy("appe_time", false));
                    if (!Cools.isEmpty(agvWrkMastLogs)) {
                        AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMastLogs.get(0).getLocNo());
                        if (agvLocMast != null) {
                            log.info("补充逻辑生效：{}", order.getOrderNo());
                            order.setPltType(agvLocMast.getPltType());
                        }
                    }
@@ -143,7 +154,7 @@
                        orderDetlService.updateById(orderDetl);
                    }
                }
            }
           // }

        }
    }