#

Junjie

2025-02-14 ac4341ea6b66ae02427d39d35f41d42d78b2eb2e

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

@@ -14,6 +14,7 @@
import com.zy.asrs.wms.asrs.entity.template.OrderTemplate;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -45,6 +46,7 @@

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/page")
    @CacheData(tableName = {"man_order"})
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
@@ -53,6 +55,7 @@

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/in/page")
    @CacheData(tableName = {"man_order", "man_order_type"})
    public R pageIn(@RequestBody Map<String, Object> map) {
        String condition = map.getOrDefault("condition", "").toString();
        BaseParam baseParam = buildParam(map, BaseParam.class);
@@ -75,7 +78,7 @@
        }

        Object paramObj = map.get("_param");
        if(paramObj != null) {
        if (paramObj != null) {
            Map param = (Map) paramObj;
            for (Object value : param.entrySet()) {
                Map.Entry entry = (Map.Entry) value;
@@ -91,6 +94,7 @@

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/out/page")
    @CacheData(tableName = {"man_order", "man_order_type"})
    public R pageOut(@RequestBody Map<String, Object> map) {
        String condition = map.getOrDefault("condition", "").toString();
        BaseParam baseParam = buildParam(map, BaseParam.class);
@@ -133,12 +137,14 @@

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

    @PreAuthorize("hasAuthority('asrs:order:list')")
    @GetMapping("/order/{id}")
    @CacheData(tableName = {"man_order"})
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(orderService.getById(id));
    }
@@ -193,15 +199,20 @@
    @PostMapping("/order/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        String ioModel = map.getOrDefault("ioModel", "").toString();
        List<Order> list = orderService.list();
        map.remove("ioModel");

        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
        QueryWrapper<Order> queryWrapper = pageParam.buildWrapper(true);

        List<Order> list = orderService.list(queryWrapper);
        if (!Cools.isEmpty(ioModel)) {
            LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
            ArrayList<Long> types = new ArrayList<>();
            for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, ioModel.equals("in") ? 1 : 2))) {
                types.add(orderType.getId());
            }
            wrapper.in(Order::getOrderType, types);
            list = orderService.list(wrapper);
            queryWrapper.in("order_type", types);
            list = orderService.list(queryWrapper);
        }
        ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
    }