1.完善订单出库自动勾选 2.完善组托删除

zwl

2026-01-13 a52a9bd9365d22e430de95b60f2c3dd821457307

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -90,6 +90,62 @@
        }
        return R.ok().add(orders);
    }
    @RequestMapping(value = "/order/nav/list/auth/xs")
    @ManagerAuth
    public R navListxs(@RequestParam(required = false) String orderNo){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        wrapper.le("settle", 2).eq("status", 1);
        wrapper.orderBy("create_time", false);
        wrapper.eq("doc_type", 81);
        List<Order> orders = orderService.selectList(wrapper);
        // 保留出库单
        if (!Cools.isEmpty(orders)) {
            Iterator<Order> iterator = orders.iterator();
            while (iterator.hasNext()) {
                Order order = iterator.next();
                if (order.getDocType() != null) {
                    DocType docType = docTypeService.selectById(order.getDocType());
                    if (docType != null) {
                        if (docType.getPakout() == 0) {
                            iterator.remove();
                        }
                    }
                }
            }
        }
        return R.ok().add(orders);
    }

    @RequestMapping(value = "/order/nav/list/auth/notxs")
    @ManagerAuth
    public R navListnotxs(@RequestParam(required = false) String orderNo){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        wrapper.le("settle", 2).eq("status", 1);
        wrapper.orderBy("create_time", false);
        List<Order> orders = orderService.selectList(wrapper);
        // 保留出库单
        if (!Cools.isEmpty(orders)) {
            Iterator<Order> iterator = orders.iterator();
            while (iterator.hasNext()) {
                Order order = iterator.next();
                if (order.getDocType() != null) {
                    DocType docType = docTypeService.selectById(order.getDocType());
                    if (docType != null) {
                        if (docType.getPakout() == 0 || order.getDocType() == 81) {
                            iterator.remove();
                        }
                    }
                }
            }
        }
        return R.ok().add(orders);
    }

    @RequestMapping(value = "/order/head/page/auth")
    @ManagerAuth
@@ -105,6 +161,9 @@
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        if(param.get("doc_type") != null){
            wrapper.eq("doc_type", param.get("doc_type"));
        }
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
    }