自动化立体仓库 - WMS系统
zyx
2024-04-10 e8eb22e3ab73fabe436b8c24d372e7f48b711b30
src/main/java/com/zy/asrs/controller/OrderController.java
@@ -126,7 +126,7 @@
    @RequestMapping(value = "/order/detls/pakin/page/auth")
    @ManagerAuth
    public R orderDetls(@RequestParam(defaultValue = "1")Integer curr,
                        @RequestParam(defaultValue = "10000")Integer limit,
                        @RequestParam(defaultValue = "100")Integer limit,
                        @RequestParam(required = false)String orderByField,
                        @RequestParam(required = false)String orderByType,
                        @RequestParam Map<String, Object> param){
@@ -134,15 +134,20 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("settle").orderBy("create_time", false);
            wrapper.orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            docIds.add(pakin.getDocId());
        }
        wrapper.in("doc_type",docIds);
        EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
        List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
        List<String> orderNos = new ArrayList<>();
        for (Order order : orders) {
            orderNos.add(order.getOrderNo());
        }
        wrapper.in("order_no",orderNos);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }