Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-02 68de8850d0c2fb4e5efef77ad92275ff05686708

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

@@ -44,8 +44,9 @@
        excludeTrash(param);
        EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        wrapper.orderBy("appe_time",false);
        allLike(AdjDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));}
        return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }