#

whycq

2024-05-05 0146de915c3bb74dcce2c39debcbdb8cf692623d

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

@@ -133,22 +133,33 @@
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            docIds.add(pakin.getDocId());
        }
        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);
        wrapper.in("source",docIds);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
//        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
//        excludeTrash(param);
//        convert(param, wrapper);
//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
//            wrapper.orderBy("create_time", false);
//        }
//        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
//        List<Long> docIds = new ArrayList<>();
//        for (DocType pakin : pakins) {
//            docIds.add(pakin.getDocId());
//        }
//        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));
    }

    @RequestMapping(value = "/order/detl/all/auth")
@@ -572,6 +583,7 @@
            if (orderDetl == null) {
                orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                orderDetl.setSource(docType.getDocId().intValue());
                orderDetl.setBatch(null);
                orderDetl.setAnfme(anfme);
                orderDetl.setOrderId(order.getId());