# 并板出库

whycq

2024-07-04 09a482e8fb4d4dac63aed1503fd91e738ddb070d

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

@@ -42,11 +42,27 @@
        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);
        }
        wrapper.eq("status", 0);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
        wrapper.eq("status", 1);
        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        // 根据商品编号和批号，分别在立库和平库库存表中查询其存量，并存入两个临时属性中
        orderDetlPage.getRecords().forEach(orderDetl -> {
            Map<String, Long> map = orderDetlService.selectCountByMatnr(orderDetl.getMatnr(), orderDetl.getBatch());
            orderDetl.setSupp(String.valueOf(map.get("asrCount")));
            orderDetl.setSuppCode(String.valueOf(map.get("manCount")));
        });
        return R.ok(orderDetlPage);
    }

    @RequestMapping(value = "/orderDetl/pakout/list/auth")
    @ManagerAuth
    public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam Map<String, Object> param){
        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -56,6 +72,8 @@
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else if (entry.getKey().equals("order_id")) {
                wrapper.eq(entry.getKey(), val);
            } else {
                wrapper.like(entry.getKey(), val);
            }