From 7791f6b4849d02d8b8484e1faa61af62e23600b4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 03 七月 2020 10:18:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index 671ba6b..5f879c3 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -32,7 +32,7 @@
}
@RequestMapping(value = "/trayCode/list/auth")
-// @ManagerAuth
+ @ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@@ -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));
}
@@ -124,8 +127,15 @@
return R.ok();
}
- @PostMapping(value = "/trayCode/print/preview")
-// @ManagerAuth
+ @RequestMapping(value = "/trayCode/latest")
+ @ManagerAuth
+ public R trayCodeLatest() {
+ 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")
+ @ManagerAuth
public R printPreview(@RequestParam String startNo,
@RequestParam Integer count,
@RequestParam Integer type) {
@@ -140,7 +150,7 @@
}
@RequestMapping(value = "/trayCode/print/auth")
-// @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
+ @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
public R print(@RequestParam String startNo,
@RequestParam Integer count,
@RequestParam Integer type){
--
Gitblit v1.9.1