#

whycq

2025-01-08 d3cb0e841e6585aa84a45f18bb30965db8d1a6aa

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

@@ -57,6 +57,21 @@
        return R.ok(orderDetlPage);
    }

    @RequestMapping("/orderPakin/page/auth")
    @ManagerAuth(memo = "查询入库订单")
    public R orderPakinPage(@RequestParam(defaultValue = "1")Integer curr,
                            @RequestParam(defaultValue = "10")Integer limit,
                            @RequestParam(required = false)String orderByField,
                            @RequestParam(required = false)String orderByType,
                            @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convertLike(param, wrapper);
        wrapper.eq("source",30);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(page);
    }

    @RequestMapping(value = "/orderDetl/pakout/list/auth")
    @ManagerAuth
    public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
@@ -80,6 +95,19 @@
        }
    }

    private <T> void convertLike(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/orderDetl/add/auth")
    @ManagerAuth
    public R add(OrderDetl orderDetl) {