#

Junjie

2024-10-11 53e395fc633608d80299b104dacbdf7921ab7815

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java

@@ -166,8 +166,33 @@
    }

    @Override
    public List<OrderNameListDto> selectAllCombOrderNo(Long hostId) {
        List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
        if (Cools.isEmpty(list)){
            return null;
        }
        ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
        for (Order order :list){
            DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));

            if (order.getSettle() >= 4) {
                continue;
            }

            if (docType.getPakin() == 1){
                OrderNameListDto orderNameListDto = new OrderNameListDto();
                orderNameListDto.setOrder_no(order.getOrderNo());
                orderNameListDtos.add(orderNameListDto);
            }
        }

        return orderNameListDtos;

    }

    @Override
    public List<OrderNameListDto> selectAllorderNo(Long hostId) {
        List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId));
        List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
        if (Cools.isEmpty(list)){
            return null;
        }
@@ -191,10 +216,12 @@
        List<Order> list = list(new LambdaQueryWrapper<Order>()
                .eq(Order::getHostId, hostId)
                .like(Order::getOrderNo, orderNo)
                .orderByDesc(Order::getCreateTime)
        );
        if (Cools.isEmpty(orderNo) || orderNo.isEmpty()){
            list = list(new LambdaQueryWrapper<Order>()
                    .eq(Order::getHostId, hostId)
                    .orderByDesc(Order::getCreateTime)
            );
        }
        if (Cools.isEmpty(list)){
@@ -204,6 +231,10 @@
        for (Order order :list){
            DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));

            if (order.getSettle() >= 4) {
                continue;
            }

            if (docType.getPakout() == 1){
                orderNameListDtos.add(order.getOrderNo());
            }