#

Junjie

2024-08-13 fc464a48c95cc0710d89501d9df99312c3efa603

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

@@ -132,6 +132,22 @@
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();

        if (!Cools.isEmpty(param.get("decrees"))) {
            ArrayList<String> mats = new ArrayList<>();
            List<Mat> decrees = matService.list(new LambdaQueryWrapper<Mat>().like(Mat::getDecrees, param.get("decrees")));
            if (decrees.isEmpty()) {
                mats.add("-1");
            }else {
                for (Mat mat : decrees) {
                    mats.add(mat.getMatnr());
                }
            }

            wrapper.in("matnr", mats);
            param.remove("decrees");
        }

        convert(param,wrapper);
        wrapper.eq("host_id", getHostId());
//        if (!Cools.isEmpty(condition)) {
@@ -145,6 +161,7 @@
        if (!Cools.isEmpty(param.get("locNo"))) {
            wrapper.eq("loc_no", param.get("locNo"));
        }

        param.remove("locNo");
        param.remove("owner");
        param.remove("zpallet");