From e62569856fdfb0c7c31ee88cf96628af08eabf85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 12:34:15 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/asrs/controller/NodeController.java | 133 +++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index f03e4e7..4e100cb 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -12,7 +12,11 @@
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.Node;
+import com.zy.asrs.entity.param.InitPakoutParam;
+import com.zy.asrs.entity.param.PakinParam;
+import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.NodeService;
import com.zy.common.entity.NodeExcel;
import com.zy.common.entity.NodeExcelListener;
@@ -30,8 +34,6 @@
import java.net.URLEncoder;
import java.util.*;
-import static jdk.nashorn.api.scripting.ScriptUtils.convert;
-
@RestController
public class NodeController extends BaseController {
@@ -39,6 +41,8 @@
private NodeService nodeService;
@Autowired
private TreeUtils treeUtils;
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
@RequestMapping(value = "/node/{id}/auth")
@ManagerAuth
@@ -48,53 +52,59 @@
@RequestMapping(value = "/node/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){
+ 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<Node> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/node/list/tree/auth")
@ManagerAuth
- public R listTree(@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){
+ public R listTree(@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<Node> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
}
@RequestMapping(value = "/node/tree/auth")
@ManagerAuth
- public R tree(@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){
+ public R tree(@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<Node> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ 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]));
@@ -107,10 +117,14 @@
@RequestMapping(value = "/node/add/auth")
@ManagerAuth
public R add(Node node) {
+ Node node1 = nodeService.selectByUuid(node.getName());
+ if (!Cools.isEmpty(node1)) {
+ throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+ }
if (node.getType() != 1) {
Node parentNode = nodeService.selectById(node.getParentId());
if (parentNode == null || parentNode.getStatus() == 0) {
- return R.error(node.getType()==2?"鎵�灞炰粨搴撲笉瀛樺湪":"鎵�灞炲簱鍖轰笉瀛樺湪");
+ return R.error(node.getType() == 2 ? "鎵�灞炰粨搴撲笉瀛樺湪" : "鎵�灞炲簱鍖轰笉瀛樺湪");
}
node.setParentName(parentNode.getName());
node.setLevel(parentNode.getLevel() + 1);
@@ -120,7 +134,6 @@
nodeUtils.executePath(node);
node.setHostId(getHostId());
node.setUuid(node.getName().toString());
- System.out.println(node.getUuid());
node.setPath(nodeUtils.path.toString());
node.setNamePath(nodeUtils.pathName.toString());
node.setLevel(node.getType());
@@ -133,16 +146,21 @@
return R.ok();
}
+
@RequestMapping(value = "/node/update/auth")
@ManagerAuth
- public R update(Node node){
- if (Cools.isEmpty(node) || null==node.getId()){
+ public R update(Node node) {
+ Node node1 = nodeService.selectByUuid(node.getName());
+ if (!Cools.isEmpty(node1)) {
+ throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+ }
+ if (Cools.isEmpty(node) || null == node.getId()) {
return R.error();
}
if (node.getType() != 1) {
Node parentNode = nodeService.selectById(node.getParentId());
if (parentNode == null || parentNode.getStatus() == 0) {
- return R.error(node.getType()==2?"鎵�灞炰粨搴撲笉瀛樺湪":"鎵�灞炲簱鍖轰笉瀛樺湪");
+ return R.error(node.getType() == 2 ? "鎵�灞炰粨搴撲笉瀛樺湪" : "鎵�灞炲簱鍖轰笉瀛樺湪");
}
node.setParentName(parentNode.getName());
node.setLevel(parentNode.getLevel() + 1);
@@ -152,7 +170,9 @@
nodeUtils.executePath(node);
node.setPath(nodeUtils.path.toString());
node.setNamePath(nodeUtils.pathName.toString());
+ node.setUuid(node.getName());
+ manLocDetlMapper.updateLocNo0(node.getId(), node.getName());
node.setUpdateBy(getUserId());
node.setUpdateTime(new Date());
nodeService.updateById(node);
@@ -161,12 +181,12 @@
@RequestMapping(value = "/node/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<Node> list = JSONArray.parseArray(param, Node.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (Node entity : list){
+ for (Node entity : list) {
nodeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -174,8 +194,8 @@
@RequestMapping(value = "/node/delete0/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
nodeService.deleteById(id);
}
return R.ok();
@@ -183,7 +203,7 @@
@RequestMapping(value = "/node/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("node"));
@@ -200,10 +220,10 @@
hostEq(wrapper);
Page<Node> page = nodeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Node node : page.getRecords()){
+ for (Node node : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", node.getId());
- map.put("value", node.getUuid() + "锛�" +node.getName()+ "锛�");
+ map.put("value", node.getUuid() + "锛�" + node.getName() + "锛�");
result.add(map);
}
return R.ok(result);
@@ -213,7 +233,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Node> wrapper = new EntityWrapper<Node>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != nodeService.selectOne(wrapper)){
+ if (null != nodeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Node.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -276,7 +296,44 @@
public R nodeExcelImport(MultipartFile file) throws IOException {
NodeExcelListener listener = new NodeExcelListener(getUserId(), getHostId());
EasyExcel.read(file.getInputStream(), NodeExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"涓揣浣�");
+ return R.ok("鎴愬姛鍚屾" + listener.getTotal() + "涓揣浣�");
+ }
+
+ /*************************************** 鍏ュ簱鍑虹浉鍏� ***********************************************/
+
+ @RequestMapping("/work/stock/pakin")
+ @ManagerAuth(memo = "鍏ュ簱")
+ public R stockPakin(@RequestBody PakinParam number) {
+ return nodeService.stockPakin(number, getUserId(), getHostId());
+ }
+
+ @RequestMapping("/work/stock/pakout")
+ @ManagerAuth(memo = "鍑哄簱")
+ public R initPakout(@RequestBody List<InitPakoutParam> params) {
+ return nodeService.initPakout(params, getUserId(), getHostId());
+ }
+
+ @PostMapping(value = "/work/empty/stock")
+ public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
+ List<Node> allEmptys = nodeService.selectList(new EntityWrapper<Node>()
+ .eq("type", "3"));
+ return R.ok().add(allEmptys);
+ }
+
+ @RequestMapping("/work/move/start")
+ @ManagerAuth(memo = "搴撲綅绉昏浆")
+ public R locMoveStart(@RequestParam String sourceLocNo,
+ @RequestParam String targetLocNo) {
+ nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
+ return R.ok("绉诲簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping(value = "/node/select/{id}/auth")
+ @ManagerAuth
+ public R getById(@PathVariable("id") String id) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("uuid", id));
+ return R.ok(node);
}
}
--
Gitblit v1.9.1