Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

zc

2024-09-03 b196900d48deefb0129e28df0a842fadc3d6bff1

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

@@ -20,11 +20,10 @@
public class OrderMoveHistoryHandler extends AbstractHandler<String> {
    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderDetlService orderDetlService;

    public ReturnT<String> move(){
    public ReturnT<String> start(){
        List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
                .eq("settle", 6));
        for (Order order : settleEqual6) {
@@ -35,6 +34,7 @@
        }
        return SUCCESS;
    }

    private void moveBoth(Order order, List<OrderDetl> orderDetls){
        Date now = new Date();
        if (!Cools.isEmpty(orderDetls)) {