From bb2ba875a4c7ed5f0c31a216862c5fd4cbf88c6e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 19 九月 2025 09:24:24 +0800
Subject: [PATCH] 新增仓库 新增库区 新增缓冲区库位
---
src/main/java/com/zy/asrs/controller/BasWhsController.java | 81 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index bdd436f..044bfd5 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasWhs;
-import com.zy.asrs.service.BasWhsService;
+import com.zy.asrs.entity.BasWhsType;
+import com.zy.asrs.service.BasWhsTypeService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -22,12 +22,12 @@
public class BasWhsController extends BaseController {
@Autowired
- private BasWhsService basWhsService;
+ private BasWhsTypeService basWhsTypeService;
@RequestMapping(value = "/basWhs/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(basWhsService.selectById(String.valueOf(id)));
+ return R.ok(basWhsTypeService.selectById(String.valueOf(id)));
}
@RequestMapping(value = "/basWhs/list/auth")
@@ -38,82 +38,83 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
+ EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basWhsService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(basWhsTypeService.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.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/basWhs/add/auth")
- @ManagerAuth
- public R add(BasWhs basWhs) {
- basWhs.setModiUser(getUserId());
- basWhs.setModiTime(new Date());
- basWhs.setAppeUser(getUserId());
- basWhs.setAppeTime(new Date());
- basWhsService.insert(basWhs);
+ @ManagerAuth(memo = "搴撲綅绫诲瀷娣诲姞")
+ public R add(BasWhsType basWhsType) {
+ basWhsType.setModiUser(getUserId());
+ basWhsType.setModiTime(new Date());
+ basWhsType.setAppeUser(getUserId());
+ basWhsType.setAppeTime(new Date());
+ basWhsTypeService.insert(basWhsType);
return R.ok();
}
@RequestMapping(value = "/basWhs/update/auth")
- @ManagerAuth
- public R update(BasWhs basWhs){
- if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
+ @ManagerAuth(memo = "搴撲綅绫诲瀷淇敼")
+ public R update(BasWhsType basWhsType){
+ if (Cools.isEmpty(basWhsType) || null== basWhsType.getId()){
return R.error();
}
- basWhs.setModiUser(getUserId());
- basWhs.setModiTime(new Date());
- basWhsService.updateById(basWhs);
+ basWhsType.setModiUser(getUserId());
+ basWhsType.setModiTime(new Date());
+ basWhsTypeService.updateById(basWhsType);
return R.ok();
}
@RequestMapping(value = "/basWhs/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷鍒犻櫎")
public R delete(@RequestParam String param){
- List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
+ List<BasWhsType> list = JSONArray.parseArray(param, BasWhsType.class);
if (Cools.isEmpty(list)){
return R.error();
}
- for (BasWhs entity : list){
- basWhsService.delete(new EntityWrapper<>(entity));
+ for (BasWhsType entity : list){
+ basWhsTypeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
}
@RequestMapping(value = "/basWhs/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
+ EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWhs"));
convert(map, wrapper);
- List<BasWhs> list = basWhsService.selectList(wrapper);
+ List<BasWhsType> list = basWhsTypeService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basWhsQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
+ EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
wrapper.like("whs_desc", condition);
- Page<BasWhs> page = basWhsService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasWhsType> page = basWhsTypeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWhs basWhs : page.getRecords()){
+ for (BasWhsType basWhsType : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", basWhs.getId());
- map.put("value", basWhs.getWhsDesc());
+ map.put("id", basWhsType.getId());
+ map.put("value", basWhsType.getWhsDesc());
result.add(map);
}
return R.ok(result);
@@ -122,9 +123,9 @@
@RequestMapping(value = "/basWhs/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasWhs> wrapper = new EntityWrapper<BasWhs>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWhsService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasWhs.class, String.valueOf(param.get("key"))));
+ Wrapper<BasWhsType> wrapper = new EntityWrapper<BasWhsType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basWhsTypeService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasWhsType.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
--
Gitblit v1.9.1