From 82c36e2b434fa7a1c16b0448aa4cf1483107f79c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 02 十二月 2025 16:28:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 9f2d29e..35488c6 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -17,10 +17,10 @@
import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
-import com.zy.common.model.NavigateNode;
+import com.zy.common.utils.RedisUtil;
import com.zy.common.web.BaseController;
-import com.zy.core.enums.MapNodeType;
-
+import com.zy.core.enums.LocStsType;
+import com.zy.core.enums.RedisKeyType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +36,8 @@
private LocMastService locMastService;
@Autowired
private BasMapService basMapService;
+ @Autowired
+ private RedisUtil redisUtil;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -160,7 +162,7 @@
String nodeType = map.getString("type");
if("shelf".equals(nodeType)) {
if(initBay == -1) {
- initBay = 1;
+ initBay = 2;
}
HashMap<String, Object> locNoMap = new HashMap<>();
@@ -188,16 +190,21 @@
LocMast locMast = new LocMast();
int row = (int) map.get("row");
int bay = (int) map.get("bay");
+ int mapX = (int) map.get("mapX");
+ int mapY = (int) map.get("mapY");
locMast.setLocNo(Utils.getLocNo(row, bay, finalLev));
+ locMast.setLocSts(String.valueOf(LocStsType.O));
locMast.setRow1(row);
locMast.setBay1(bay);
locMast.setLev1(finalLev);
+ locMast.setLocType(Utils.getLocNo(mapX, mapY, finalLev));
locMast.setStatus(1);
locMast.setAppeTime(new Date());
locMastService.insert(locMast);
});
}
+ redisUtil.del(RedisKeyType.LOC_MAP_BASE.key);
return R.ok();
}
--
Gitblit v1.9.1