From f915165192845acd12aca37fecec6976eb1f870c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 12 六月 2025 11:02:57 +0800
Subject: [PATCH] 转库出库初步完成，生成单据也成功了；显示需要添加菜单及其权限
---
src/main/java/com/zy/asrs/controller/StoreTypeController.java | 130 +++++++++++++++++++++++++++++--------------
1 files changed, 87 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StoreTypeController.java b/src/main/java/com/zy/asrs/controller/StoreTypeController.java
index ab36b61..bbea041 100644
--- a/src/main/java/com/zy/asrs/controller/StoreTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/StoreTypeController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -9,7 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.BasWrkIotype;
import com.zy.asrs.entity.StoreType;
import com.zy.asrs.service.StoreTypeService;
import com.zy.common.web.BaseController;
@@ -24,21 +25,21 @@
@Autowired
private StoreTypeService storeTypeService;
- @RequestMapping(value = "/storeType/{id}/auth")
+ @RequestMapping(value = "/store/{id}/auth")
@ManagerAuth
- public R get(@PathVariable("id") String id) {
+ public R get(@PathVariable("id") Long id) {
return R.ok(storeTypeService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/storeType/list/auth")
+ @RequestMapping(value = "/store/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
excludeTrash(param);
+ EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
@@ -59,53 +60,107 @@
}
}
- @RequestMapping(value = "/storeType/add/auth")
+ @RequestMapping(value = "/store/edit/auth")
@ManagerAuth
- public R add(StoreType docType) {
- docType.setStatus(1);
- docType.setCreateBy(getUserId());
- docType.setCreateTime(new Date());
- docType.setUpdateBy(getUserId());
- docType.setUpdateTime(new Date());
- storeTypeService.insert(docType);
- return R.ok();
- }
-
- @RequestMapping(value = "/storeType/update/auth")
- @ManagerAuth
- public R update(StoreType docType) {
- if (Cools.isEmpty(docType) || null == docType.getStoreId()) {
+ public R edit(@RequestParam(required = false) String param) {
+ if (Cools.isEmpty(param)) {
return R.error();
}
- docType.setUpdateBy(getUserId());
- docType.setUpdateTime(new Date());
- storeTypeService.updateById(docType);
+ StoreType storeType = storeTypeService.selectById(param);
+ storeType.setOwn(1);
+ storeTypeService.updateById(storeType);
return R.ok();
}
- @RequestMapping(value = "/storeType/delete/auth")
+ @RequestMapping(value = "/store/edit2/auth")
@ManagerAuth
- public R delete(@RequestParam(value = "ids[]") Long[] ids) {
- for (Long id : ids) {
- storeTypeService.deleteById(id);
+ public R edit2(@RequestParam(required = false) String param) {
+ if (Cools.isEmpty(param)) {
+ return R.error();
+ }
+ StoreType storeType = storeTypeService.selectById(param);
+ storeType.setOwn(0);
+ storeTypeService.updateById(storeType);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/store/add/auth")
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬫坊鍔�")
+ public R add(StoreType basWrkIotype) {
+ basWrkIotype.setUpdateBy(getUserId());
+ basWrkIotype.setUpdateTime(new Date());
+ basWrkIotype.setCreateBy(getUserId());
+ basWrkIotype.setCreateTime(new Date());
+ storeTypeService.insert(basWrkIotype);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/store/update/auth")
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬩慨鏀�")
+ public R update(StoreType basWrkIotype) {
+ if (Cools.isEmpty(basWrkIotype) || null == basWrkIotype.getStoreId()) {
+ return R.error();
+ }
+ basWrkIotype.setUpdateBy(getUserId());
+ basWrkIotype.setUpdateTime(new Date());
+ storeTypeService.updateById(basWrkIotype);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/store/delete/auth")
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪垹闄�")
+ public R delete(@RequestParam String param) {
+ List<StoreType> list = JSONArray.parseArray(param, StoreType.class);
+ if (Cools.isEmpty(list)) {
+ return R.error();
+ }
+ for (StoreType entity : list) {
+ storeTypeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
}
- @RequestMapping(value = "/storeType/export/auth")
- @ManagerAuth
+ @RequestMapping(value = "/store/export/auth")
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪鍑�")
public R export(@RequestBody JSONObject param) {
- EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("docType"));
+ EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkIotype"));
convert(map, wrapper);
List<StoreType> list = storeTypeService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
- @RequestMapping(value = "/storeTypeQuery/auth")
+ @RequestMapping(value = "/store/auth")
@ManagerAuth
public R query(String condition) {
+ EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
+ wrapper.like("io_desc", condition);
+ Page<StoreType> page = storeTypeService.selectPage(new Page<>(0, 20), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (StoreType basWrkIotype : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basWrkIotype.getStoreId());
+ map.put("value", basWrkIotype.getStoreName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/store/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<StoreType> wrapper = new EntityWrapper<StoreType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != storeTypeService.selectOne(wrapper)) {
+ return R.parse(BaseRes.REPEAT).add(getComment(BasWrkIotype.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+
+ @RequestMapping(value = "/storeTypeQuery/auth")
+ @ManagerAuth
+ public R query3(String condition) {
EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
wrapper.like("store_name", condition);
wrapper.eq("status", 1);
@@ -136,15 +191,4 @@
}
return R.ok(result);
}
-
- @RequestMapping(value = "/storeType/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<StoreType> wrapper = new EntityWrapper<StoreType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != storeTypeService.selectOne(wrapper)) {
- return R.parse(BaseRes.REPEAT).add(getComment(DocType.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
}
--
Gitblit v1.9.1