#

luxiaotao1123

2020-07-03 7791f6b4849d02d8b8484e1faa61af62e23600b4

#

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

@@ -42,6 +42,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
//            wrapper.orderBy("id", false);
        }
        return R.ok(trayCodeService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -127,8 +130,8 @@
    @RequestMapping(value = "/trayCode/latest")
    @ManagerAuth
    public R trayCodeLatest() {
        TrayCode latest = trayCodeService.selectOne(new EntityWrapper<TrayCode>().orderBy("id", false));
        return R.ok().add(latest==null?"000001":latest.getTrayNo());
        List<TrayCode> latest = trayCodeService.selectList(new EntityWrapper<TrayCode>().orderBy("id", false));
        return R.ok().add(latest.isEmpty()?"100001": Integer.parseInt(latest.get(0).getTrayNo())+1);
    }

    @RequestMapping(value = "/trayCode/print/preview")