From b4227b5145943e067351a2a59ca34826b41d6fb7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 15 四月 2025 09:46:30 +0800
Subject: [PATCH] 界面翻译为俄语
---
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index 4e8f415..5e8dcee 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -10,16 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.TrayCode;
import com.zy.asrs.service.TrayCodeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class TrayCodeController extends BaseController {
@@ -44,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);
}
}
}
@@ -126,4 +128,52 @@
return R.ok();
}
+ @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);
+ }
+
+ @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<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 = "鎵樼洏鐮佹墦鍗�")
+ public R print(@RequestParam String startNo,
+ @RequestParam Integer count,
+ @RequestParam Integer type){
+ if (count <= 0) {
+ return R.error("袣芯谢懈褔械褋褌胁芯 写芯谢卸薪芯 斜褘褌褜 斜芯谢褜褕械 薪褍谢褟");
+ }
+ for (int i = 0; i<count; i++) {
+ TrayCode trayCode = new TrayCode(
+ String.valueOf(Integer.parseInt(startNo)+i), // 搴忓垪鍙穂闈炵┖]
+ i==0?"Y":"N", // 璧峰
+ i==count-1?"Y":"N", // 缁堟
+ null, // 澶囨敞
+ new Date(), // 淇敼鏃堕棿
+ getUserId(), // 淇敼浜哄憳
+ new Date(), // 娣诲姞鏃堕棿
+ getUserId() // 娣诲姞浜哄憳
+ );
+ if (!trayCodeService.insert(trayCode)) {
+ throw new CoolException("淇濆瓨搴忓垪鍙峰け璐�");
+ }
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1