获取堆垛机状态及所属巷道库位统计信息

pang.jiabao

1 天以前 f1a3407130d88ad15320ab9fcfabd109e5127c78

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

@@ -42,17 +42,21 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
//            wrapper.orderBy("id", false);
        }
        return R.ok(trayCodeService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            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(), String.valueOf(entry.getValue()));
                wrapper.like(entry.getKey(), val);
            }
        }
    }
@@ -124,11 +128,18 @@
        return R.ok();
    }

    @RequestMapping(value = "/trayCode/latest")
    @ManagerAuth
    public R trayCodeLatest() {
        List<TrayCode> latest = trayCodeService.selectList(new EntityWrapper<TrayCode>().orderBy("id", false));
        return R.ok().add(latest.isEmpty()?"10000001": Integer.parseInt(latest.get(0).getTrayNo())+1);
    }

    @RequestMapping(value = "/trayCode/print/preview")
    @ManagerAuth
    public R printPreview(@RequestParam String startNo,
                   @RequestParam Integer count,
                   @RequestParam Integer type) {
                          @RequestParam Integer count,
                          @RequestParam Integer type) {
        if (count <= 0) {
            return R.error("数量必须大于零");
        }