From 391dd89a6583e0f1eceaf1297fd852e3da32bf68 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 17 四月 2025 16:39:30 +0800
Subject: [PATCH] 出库作业里面显示冻结/未冻结
---
src/main/java/com/zy/asrs/controller/NodeController.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 1a63a36..b6836cf 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -13,9 +13,8 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.InitPakoutParam;
-import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.entity.param.NodeInitPatam;
import com.zy.asrs.entity.param.PakinParam;
import com.zy.asrs.entity.result.KeyValueVo;
@@ -24,7 +23,6 @@
import com.zy.common.entity.NodeExcel;
import com.zy.common.entity.NodeExcelListener;
import com.zy.common.entity.Parameter;
-import com.zy.common.model.Shelves;
import com.zy.common.utils.ListUtils;
import com.zy.common.utils.NodeUtils;
import com.zy.common.utils.TreeUtils;
@@ -38,8 +36,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
-
-import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
public class NodeController extends BaseController {
@@ -155,10 +151,10 @@
@RequestMapping(value = "/node/update/auth")
@ManagerAuth
public R update(Node node){
- Node node1 = nodeService.selectByUuid(node.getName());
- if (!Cools.isEmpty(node1)) {
- throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
- }
+// Node node1 = nodeService.selectByUuid(node.getName());
+// if (!Cools.isEmpty(node1)) {
+// throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+// }
if (Cools.isEmpty(node) || null==node.getId()){
return R.error();
}
@@ -352,7 +348,7 @@
EntityWrapper<Node> nodeEntityWrapper = new EntityWrapper<>();
nodeEntityWrapper.eq("id",param.getValue());
nodeEntityWrapper.eq("name",param.getName());
- nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
+// nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
Node node = nodeService.selectOne(nodeEntityWrapper);
String[] string = node.getNamePath().split(",");
int tno=1; int no=1;
@@ -389,14 +385,22 @@
}
}else {
- locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
+ locNo = param.getName()+String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
}
-
-
+ //瀹㈡埛瑕佹眰鏍煎紡浣岮-01-01-01
+ StringBuilder sb = new StringBuilder(locNo);
+ sb.insert(sb.length()-4,"-");
+ sb.insert(sb.length()-2,"-");
+ locNo = sb.toString();
if (locNo == null){
continue;
+ }
+
+ List<Node> nodeList = nodeService.selectList(new EntityWrapper<Node>().eq("name", locNo));
+ if (!Cools.isEmpty(nodeList)){
+ throw new CoolException("搴撲綅鍙烽噸澶�");
}
Date now = new Date();
@@ -417,9 +421,12 @@
node1.setRow1(r);
node1.setBay1(b);
node1.setLev1(l);
+
if (!nodeService.insert(node1)){
return R.error("鏁版嵁鎻掑叆澶辫触");
}
+
+
}
}
@@ -479,6 +486,38 @@
return R.ok(remmendLoc);
}
+ @RequestMapping(value = "/node/updateStatus")
+ @ManagerAuth(memo = "搴撲綅鍐荤粨")
+ public R updateStockFreeze(@RequestParam String param){
+ List<Node> list = JSONArray.parseArray(param, Node.class);
+ if (Cools.isEmpty(list)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (Node node : list){
+ node.setStatus(0);
+ if (nodeService.updateStockFreeze(node.getName(), node.getStatus()) != 1){
+ return R.error(node.getName()+"鍐荤粨澶辫触");
+ }
+ }
+ return R.ok("鍐荤粨鎴愬姛");
+ }
+
+ @RequestMapping(value = "/node/updateDisStatus")
+ @ManagerAuth(memo = "搴撲綅瑙ｉ櫎鍐荤粨")
+ public R updateStockDisFreeze(@RequestParam String param){
+ List<Node> list = JSONArray.parseArray(param, Node.class);
+ if (Cools.isEmpty(list)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (Node node : list){
+ node.setStatus(1);
+ if (nodeService.updateStockFreeze(node.getName(), node.getStatus()) != 1){
+ return R.error(node.getName()+"瑙ｉ櫎鍐荤粨澶辫触");
+ }
+
+ }
+ return R.ok("瑙ｅ喕鎴愬姛");
+ }
}
--
Gitblit v1.9.1