自动化立体仓库 - WMS系统
zhangchao
2024-11-22 f4be36f30a802e70038bde438d1689eb749032fd
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -33,6 +33,25 @@
        return R.ok(wrkDetlLogService.selectById(String.valueOf(id)));
    }
    /**
     * 根据工作主档查看明细时,工作号过滤明细
     */
    @RequestMapping(value = "/wrkDetlLogByMast/list/auth")
    @ManagerAuth
    public R list1(@RequestParam(defaultValue = "1")Integer curr,
                   @RequestParam(defaultValue = "10")Integer limit,
                   @RequestParam Integer wrk_no,
                   @RequestParam String ioTime){
        EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
        if(!Cools.isEmpty(wrk_no) && wrk_no != 0){
            wrapper.eq("wrk_no",wrk_no);
        }
        if(!Cools.isEmpty(ioTime)){
            wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
        }
        return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
    }
    @RequestMapping(value = "/wrkDetlLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
@@ -45,7 +64,7 @@
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
            wrapper.orderBy("appe_time", false);
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
    }