自动化立体仓库 - WMS系统
ZY
2024-09-21 58dc66a9d999c7d350e1ee4bf32b8d85b6e20e00
src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -111,6 +111,8 @@
//                param.remove("row");
//            }
//        }
        Object query_date = param.get("query_date");
        param.remove("query_date");
        excludeTrash(param);
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
@@ -119,6 +121,12 @@
//            wrapper.and()
//                    .where("loc_no like '" +row +"%'");
//        }
        if (query_date!=null){
            if (query_date.toString().contains(" - ")) {
                String[] dates = query_date.toString().split(" - ");
                wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]);
            }
        }
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -233,7 +241,6 @@
    public R statis(@RequestParam(defaultValue = "1")Integer curr,
                    @RequestParam(defaultValue = "10")Integer limit,
                    @RequestParam Map<String, Object> param) {
        System.out.println(JSONObject.toJSON(param));
        Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class));
        return R.ok().add(stockStatis);
    }