#托盘码下架

zjj

2023-11-03 a546b70a863e44c2e8735b3cfc9da45a781b735f

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

@@ -426,9 +426,8 @@
        locCheckEntityWrapper.eq("order_no",orderNo);
        List<OrderDetl> list = orderDetlService.selectList(locCheckEntityWrapper);
        List<OrderDetlVo> orderDetlVos=new ArrayList<>();
        OrderDetlVo orderDetlVo=new OrderDetlVo();
        for (OrderDetl o:
             list) {
        for (OrderDetl o:list) {
            OrderDetlVo orderDetlVo=new OrderDetlVo();
            orderDetlVo.setOrderNo(o.getOrderNo());
            orderDetlVo.setMatnr(o.getMatnr());
            orderDetlVo.setMaktx(o.getMaktx());
@@ -469,6 +468,34 @@
        return R.ok(orderService.selectAllorderNo());
    }

    @RequestMapping(value = "/order/list/AllCu")
    @ManagerAuth
    public R orderCuList(@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() == 1) {
                            iterator.remove();
                        }
                    }
                }
            }
        }
        return R.ok().add(orders);
    }

    //订单组托2
    @RequestMapping(value = "/order/list/orderNo")
    public R orderListorderNo(@RequestParam String orderNo) {