#

lsh

2024-12-17 5cf7fe680122f247c6d15fa70aa49256a3f33bce

#

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

@@ -18,4 +18,12 @@
    public void execute(){
        orderMoveHistoryHandler.start();
    }

    /**
     * 将已上报order和orderDetl移动到log表
     */
    @Scheduled(cron = "0/30 * * * * ?")
    public void executeOrder(){
        orderMoveHistoryHandler.startOrder();
    }
}

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

@@ -39,6 +39,7 @@
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderInAndOutUtil() {
        String erpReport = Parameter.get().getErpReport();
@@ -53,7 +54,7 @@
        }
    }

    //    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrder() {
        String erpReport = Parameter.get().getErpReport();

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

@@ -46,6 +46,20 @@
        return SUCCESS;
    }

    public ReturnT<String> startOrder(){
        List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
                .eq("settle", 6));
//        List<Order> settleEqual6 = OrderInAndOutUtil.selectBySettle(null, 6L);
        for (Order order : settleEqual6) {
            List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
                    .eq("order_no", order.getOrderNo()));
//            List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
            moveBothOrder(order,orderDetls);
            log.info("已完成单据移动至历史表成功 =====>" +order);
        }
        return SUCCESS;
    }

    private void moveBoth(Order order, List<OrderDetl> orderDetls){
        Date now = new Date();
        if (!Cools.isEmpty(orderDetls)) {
@@ -80,4 +94,24 @@
        }
    }

    private void moveBothOrder(Order order, List<OrderDetl> orderDetls){
        Date now = new Date();
        if (!Cools.isEmpty(orderDetls)) {
            for (OrderDetl orderDetl : orderDetls) {
                orderDetl.setUpdateBy(0L);
                orderDetl.setUpdateTime(now);
                orderDetlService.addToLogTable(orderDetl);
                orderDetlService.delete(new EntityWrapper<OrderDetl>()
                        .eq("id",orderDetl.getId()));
            }
        }
        if (!Cools.isEmpty(order)){
            order.setUpdateBy(0L);
            order.setUpdateTime(now);
            orderService.addToLogTable(order);
            orderService.delete(new EntityWrapper<Order>()
                    .eq("id",order.getId()));
        }
    }

}

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

@@ -55,6 +55,7 @@
        orderService.insert(orderNew);
        for (OrderDetl orderDetl : orderDetls){
            OrderDetl orderDetlNew = new OrderDetl(orderDetl);
            orderDetlNew.setOrderId(orderNew.getId());
            orderDetlService.insert(orderDetlNew);
        }
        // 修改订单状态 4.完成 ===>> 6.已上报