王佳豪
2021-03-12 d113e15bf1fb77152d0476b4340cc0b6ed24e63d
src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -83,8 +83,13 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if ("0".equals(param.get("mat_status"))) {
            wrapper.isNull("mat_status");
            param.remove("mat_status");
        }
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
@@ -189,7 +194,7 @@
     */
    @RequestMapping(value = "/locDetl/getAllLocDetlData")
    @ManagerAuth
    public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
       return locDetlService.getAllLocDetlData(loc_no, matnr, matStatusFlag);
    public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status) {
       return locDetlService.getAllLocDetlData(loc_no, matnr, mat_status);
    }
}