From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 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 555c80d..c9b8626 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -65,17 +65,17 @@
@ManagerAuth
public R add(TrayCode trayCode) {
trayCodeService.insert(trayCode);
- return R.ok();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/trayCode/update/auth")
- @ManagerAuth
+ @ManagerAuth
public R update(TrayCode trayCode){
if (Cools.isEmpty(trayCode) || null==trayCode.getId()){
- return R.error();
+ return R.error("response.param_error");
}
trayCodeService.updateById(trayCode);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/trayCode/delete/auth")
@@ -83,12 +83,12 @@
public R delete(@RequestParam String param){
List<TrayCode> list = JSONArray.parseArray(param, TrayCode.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (TrayCode entity : list){
trayCodeService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/trayCode/export/auth")
@@ -123,16 +123,20 @@
public R query(@RequestBody JSONObject param) {
Wrapper<TrayCode> wrapper = new EntityWrapper<TrayCode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != trayCodeService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(TrayCode.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(TrayCode.class, String.valueOf(param.get("key"))));
+ return r;
}
- return R.ok();
+ return R.ok("response.operation_success");
}
@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()?"10000001": Integer.parseInt(latest.get(0).getTrayNo())+1);
+ R r = R.ok();
+ r.put("data", latest.isEmpty()?"10000001": Integer.parseInt(latest.get(0).getTrayNo())+1);
+ return r;
}
@RequestMapping(value = "/trayCode/print/preview")
@@ -141,22 +145,24 @@
@RequestParam Integer count,
@RequestParam Integer type) {
if (count <= 0) {
- return R.error("鏁伴噺蹇呴』澶т簬闆�");
+ return R.error("response.quantity_must_be_greater_than_zero");
}
List<Map<String, Object>> res = new ArrayList<>();
for (int i = 0; i<count; i++) {
res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i)));
}
- return R.ok().add(res);
+ R r = R.ok();
+ r.put("data",res);
+ return r;
}
@RequestMapping(value = "/trayCode/print/auth")
- @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
+ @ManagerAuth(memo = "response.tray_code_print")
public R print(@RequestParam String startNo,
@RequestParam Integer count,
@RequestParam Integer type){
if (count <= 0) {
- return R.error("鏁伴噺蹇呴』澶т簬闆�");
+ return R.error("response.quantity_must_be_greater_than_zero");
}
for (int i = 0; i<count; i++) {
TrayCode trayCode = new TrayCode(
@@ -170,7 +176,7 @@
getUserId() // 娣诲姞浜哄憳
);
if (!trayCodeService.insert(trayCode)) {
- throw new CoolException("淇濆瓨搴忓垪鍙峰け璐�");
+ throw new CoolException("response.save_serial_number_failed");
}
}
return R.ok();
--
Gitblit v1.9.1