From 45d602719964509214d06ec5173f23e5307d5dfe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 12:24:10 +0800
Subject: [PATCH] 无空库位时，不做空板入库操作
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 4c20032..8d85caf 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -44,21 +44,30 @@
return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/staDesc/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
public R add(StaDesc staDesc) {
+ int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+ .eq("type_no", staDesc.getTypeNo())
+ .eq("stn_no", staDesc.getStnNo())
+ .eq("crn_no", staDesc.getCrnNo())
+ .eq("crn_stn", staDesc.getCrnStn()));
+ if (sameRes > 0) {
+ return R.error("璺緞宸插瓨鍦�");
+ }
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
staDesc.setAppeUser(getUserId());
@@ -68,9 +77,9 @@
}
@RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞淇敼")
public R update(StaDesc staDesc){
- if (Cools.isEmpty(staDesc) || null==staDesc.getCrnNo()){
+ if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
return R.error();
}
staDesc.setModiUser(getUserId());
@@ -80,7 +89,7 @@
}
@RequestMapping(value = "/staDesc/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
public R delete(@RequestParam String param){
List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
if (Cools.isEmpty(list)){
@@ -93,7 +102,7 @@
}
@RequestMapping(value = "/staDesc/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1