From aa310a47a05110a393c508921c92fa17ea95b491 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 三月 2024 13:08:12 +0800
Subject: [PATCH] 导入修改
---
src/main/java/com/zy/asrs/controller/NodeController.java | 124 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 87ee636..84356f1 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -13,11 +13,8 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.ManLocDetl;
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;
@@ -26,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;
@@ -40,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 {
@@ -67,9 +61,9 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Node> wrapper = new EntityWrapper<>();
+ wrapper.eq("type",3);
excludeTrash(param);
convert(param, wrapper);
- hostEq(wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -98,7 +92,6 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Node> wrapper = new EntityWrapper<>();
- wrapper.ne("type",3);
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
@@ -317,13 +310,13 @@
if (node.getType() != 3) {
return R.error("浠呭彲閫夋嫨璐т綅");
}
- return nodeService.stockPakin(number, getUserId(), getHostId());
+ return nodeService.stockPakin(number, getUserId(), getHostId(),getUser());
}
@RequestMapping("/work/stock/pakout")
@ManagerAuth(memo = "鍑哄簱")
public R initPakout(@RequestBody List<InitPakoutParam> params) {
- return nodeService.initPakout(params, getUserId(), getHostId());
+ return nodeService.initPakout(params, getUserId(), getHostId(),getUser());
}
@PostMapping(value = "/work/empty/stock")
@@ -336,7 +329,7 @@
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
@RequestParam String targetLocNo) {
- nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
+ nodeService.locMove(sourceLocNo, targetLocNo, getUserId(),getUser());
return R.ok("绉诲簱鍚姩鎴愬姛");
}
@RequestMapping(value = "/node/select/{id}/auth")
@@ -348,19 +341,62 @@
}
@RequestMapping(value = "/node/init/auth")
- @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
-// @Transactional
+ @ManagerAuth(memo = "骞冲簱搴撲綅鍒濆鍖�")
+ @Transactional
public R init(NodeInitPatam param) {
List<Node> list = new ArrayList<>();
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()));
Node node = nodeService.selectOne(nodeEntityWrapper);
- for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
- for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
+ String[] string = node.getNamePath().split(",");
+ int tno=1; int no=1;
+ for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
+ for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
// 鑾峰彇搴撲綅鍙�
- String locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
+ String locNo;
+
+ if (param.getName().equals("DT-B")){
+ if (b == 2 || b ==4 || b == 7){
+ if (l == 1){
+ locNo = param.getName()+"T-" +String.format("%02d", tno) + String.format("%02d", r) + String.format("%02d", l);
+ }else {
+ locNo = null;
+ }
+
+
+ }else {
+ locNo = param.getName()+"-" +String.format("%02d", no) + String.format("%02d", r) + String.format("%02d", l);
+
+ }
+ }else if (param.getName().equals("DT-C") || param.getName().equals("DT-D")){
+ if (b == 3 || b ==6 || b == 9 || b == 12 || b == 15 || b == 17 || b == 20 || b == 23){
+ if (l == 1){
+ locNo = param.getName()+"T-" +String.format("%02d", tno) + String.format("%02d", r) + String.format("%02d", l);
+ }else {
+ locNo = null;
+ }
+
+ }else {
+ locNo = param.getName()+"-" +String.format("%02d", no) + String.format("%02d", r) + String.format("%02d", l);
+
+ }
+
+ }else {
+ 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;
+ }
Date now = new Date();
Node node1 = new Node();
@@ -386,6 +422,22 @@
}
}
+ if (param.getName().equals("DT-B")){
+ if (b == 2 || b ==4 || b == 7){
+ tno++;
+ }else {
+ no++;
+ }
+ }else if (param.getName().equals("DT-C") || param.getName().equals("DT-D")){
+ if (b == 3 || b ==6 || b == 9 || b == 12 || b == 15 || b == 17 || b == 20 || b == 23){
+ tno++;
+ }else {
+ no++;
+ }
+
+ }
+
+
}
//
// nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
@@ -419,5 +471,45 @@
return R.ok(keyValueVoList);
}
+ @RequestMapping(value = "/node/recommendLoc")
+ public R recommendLoc(@RequestParam String matnr){
+ List<String> remmendLoc = nodeService.getRemmendLoc(matnr);
+
+ 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