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 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index 0026e6b..5f879c3 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/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")
--
Gitblit v1.9.1