From 11da5829433e788d8f901ee5cd910d5923f0806a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 六月 2024 09:51:37 +0800
Subject: [PATCH] #小车地图严格模式
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
index 0c40453..d986ca4 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
@@ -24,6 +24,8 @@
import com.zy.asrs.wcs.rcs.service.DeviceService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import com.zy.asrs.wcs.system.controller.BaseController;
+import com.zy.asrs.wcs.system.entity.Dict;
+import com.zy.asrs.wcs.system.service.DictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -50,6 +52,8 @@
private DeviceService deviceService;
@Autowired
private LocService locService;
+ @Autowired
+ private DictService dictService;
//鐢熸垚鍏ュ簱浠诲姟
@PostMapping("/createInTask")
@@ -67,7 +71,14 @@
return R.error("搴撲綅鍙蜂笉瀛樺湪");
}
- if (!loc.getLocStsFlag().equals("O")) {
+ //鑾峰彇涓ユ牸妯″紡鍙傛暟
+ boolean mapStrict = true;//榛樿涓ユ牸妯″紡
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "shuttleMapStrict"));
+ if (dict != null) {
+ mapStrict = Boolean.parseBoolean(dict.getValue());
+ }
+
+ if (mapStrict && !loc.getLocStsFlag().equals("O")) {
return R.error("搴撲綅鐘舵�佷笉婊¤冻鍏ュ簱鏉′欢");
}
@@ -118,7 +129,14 @@
return R.error("搴撲綅鍙蜂笉瀛樺湪");
}
- if (!loc.getLocStsFlag().equals("F")) {
+ //鑾峰彇涓ユ牸妯″紡鍙傛暟
+ boolean mapStrict = true;//榛樿涓ユ牸妯″紡
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "shuttleMapStrict"));
+ if (dict != null) {
+ mapStrict = Boolean.parseBoolean(dict.getValue());
+ }
+
+ if (mapStrict && !loc.getLocStsFlag().equals("F")) {
return R.error("搴撲綅鐘舵�佷笉婊¤冻鍑哄簱鏉′欢");
}
@@ -219,6 +237,9 @@
return R.error("绌挎杞︿笉鍦ㄧ嚎");
}
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+ if (shuttleProtocol == null) {
+ return R.error("绌挎杞︿笉鍦ㄧ嚎");
+ }
if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) != Utils.getLev(param.getDestLoc())) {
return R.error("绌挎杞﹀拰鐩爣浣嶇疆涓嶅湪鍚屼竴妤煎眰");
}
--
Gitblit v1.9.1