#

lsh

2024-09-05 d26b4835feb289d37e3e815117080075e7fc79e8

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

@@ -137,6 +137,12 @@
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
        Object barcode = null;
        if (!Cools.isEmpty(param.get("barcode"))) {
            barcode = param.get("barcode");
        }
        param.remove("zpallet");
        param.remove("barcode");

        if (!Cools.isEmpty(param.get("decrees"))) {
            ArrayList<String> mats = new ArrayList<>();
@@ -167,13 +173,18 @@
            wrapper.eq("loc_no", param.get("locNo"));
        }

        if (!Cools.isEmpty(barcode)) {
            wrapper.eq("zpallet", barcode);
        }

        if (!Cools.isEmpty(orderByField)){
            wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
        }



        param.remove("locNo");
        param.remove("owner");
        param.remove("zpallet");
        param.remove("matnr");
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));