#

Junjie

2024-07-29 13909c99e368788a94a48753dc9f76e40a992cd6

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

@@ -5,8 +5,10 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.OrderType;
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -29,6 +31,8 @@

    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderTypeService orderTypeService;

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/page")
@@ -39,6 +43,56 @@
    }

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/in/page")
    public R pageIn(@RequestBody Map<String, Object> map) {
        String condition = map.getOrDefault("condition", "").toString();
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
//        QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();

        ArrayList<Long> types = new ArrayList<>();
        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 1))) {
            types.add(orderType.getId());
        }

        wrapper.in(Order::getOrderType, types);

        if (!Cools.isEmpty(condition)) {
            wrapper.and(wrapper1 -> {
                wrapper1.or().like(Order::getOrderNo, condition);
                wrapper1.or().like(Order::getMemo, condition);
            });
        }
        return R.ok().add(orderService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/out/page")
    public R pageOut(@RequestBody Map<String, Object> map) {
        String condition = map.getOrDefault("condition", "").toString();
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
//        QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();

        ArrayList<Long> types = new ArrayList<>();
        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 2))) {
            types.add(orderType.getId());
        }

        wrapper.in(Order::getOrderType, types);

        if (!Cools.isEmpty(condition)) {
            wrapper.and(wrapper1 -> {
                wrapper1.or().like(Order::getOrderNo, condition);
                wrapper1.or().like(Order::getMemo, condition);
            });
        }
        return R.ok().add(orderService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(orderService.list());