From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index 41da46b..84500d8 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -12,7 +12,6 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.TrayCode;
-import com.zy.asrs.entity.param.TrayCodeParam;
import com.zy.asrs.service.TrayCodeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,17 +42,21 @@
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));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -69,7 +72,7 @@
@ManagerAuth
public R update(TrayCode trayCode){
if (Cools.isEmpty(trayCode) || null==trayCode.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
trayCodeService.updateById(trayCode);
return R.ok();
@@ -80,7 +83,7 @@
public R delete(@RequestParam String param){
List<TrayCode> list = JSONArray.parseArray(param, TrayCode.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (TrayCode entity : list){
trayCodeService.delete(new EntityWrapper<>(entity));
@@ -125,21 +128,30 @@
return R.ok();
}
- @PostMapping(value = "/trayCode/print/preview")
+ @RequestMapping(value = "/trayCode/latest")
@ManagerAuth
- public R printPreview(@RequestParam TrayCodeParam param) {
- if (param.getCount() <= 0) {
+ public R trayCodeLatest() {
+ List<TrayCode> latest = trayCodeService.selectList(new EntityWrapper<TrayCode>().orderBy("id", false));
+ return R.ok().add(latest.isEmpty()?"10000001": 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) {
+ if (count <= 0) {
return R.error("鏁伴噺蹇呴』澶т簬闆�");
}
List<Map<String, Object>> res = new ArrayList<>();
- for (int i = 0; i<param.getCount(); i++) {
- res.add(Cools.add("item", String.valueOf(Integer.parseInt(param.getStartNo())+i)));
+ for (int i = 0; i<count; i++) {
+ res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i)));
}
return R.ok().add(res);
}
@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