From 97c6a268766387d9c6834c23c9da3fdf63f3dc3f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 07 二月 2024 11:26:48 +0800
Subject: [PATCH] Changes
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 82ae4e1..be0183d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -6,10 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
@@ -200,21 +197,46 @@
return R.ok(result);
}
+ @RequestMapping(value = "/basDevp/visualized/list/auth/v2")
+ public R visualizedList(@RequestParam String stationCode){
+ Map<String, Object> result = agvBasDevpService.getAgvBasDevpDtoByStationCode(stationCode);
+
+ return R.ok(result);
+ }
/*
瀹瑰櫒绂诲満
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut")
public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
-
- List<String> devNos = (List<String>) map.get("devNo");
- List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
+ List<String> devNos = new ArrayList<>();
+ List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+ try {
+ devNos = (List<String>) map.get("devNo");
+ agvWrkMastList = devNos.stream().map(devNo -> {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
+ if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ return agvWrkMast;
+ }).collect(Collectors.toList());
+ }catch (Exception e){
+ String devNo = map.get("devNo").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
- return agvWrkMast;
- }).collect(Collectors.toList());
+ agvWrkMastList.add(agvWrkMast);
+
+ }
+
+// List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
+// AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
+// if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
+// throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+// }
+// return agvWrkMast;
+// }).collect(Collectors.toList());
try {
int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
@@ -245,14 +267,36 @@
*/
@RequestMapping(value = "/basDevp/visualized/container/pickIn")
public R visualiZedPickIn(@RequestBody Map<String,Object> map){
- List<String> devNos = (List<String>) map.get("devNo");
- List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
- if(agvWrkMast.getIoType() == 101){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ List<String> devNos = new ArrayList<>();
+ List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+ try {
+ devNos = (List<String>) map.get("devNo");
+ agvWrkMastList = devNos.stream().map(devNo -> {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
+ if(agvWrkMast.getIoType() == 101){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ return agvWrkMast;
+ }).collect(Collectors.toList());
+ }catch (Exception e){
+ String devNo = map.get("devNo").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
+ if (agvWrkMast != null) {
+ if(agvWrkMast.getIoType() == 101){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ agvWrkMastList.add(agvWrkMast);
}
- return agvWrkMast;
- }).collect(Collectors.toList());
+ }
+
+// List<String> devNos = (List<String>) map.get("devNo");
+// List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
+// AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
+// if(agvWrkMast.getIoType() == 101){
+// throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+// }
+// return agvWrkMast;
+// }).collect(Collectors.toList());
agvWorkService.pickIn(agvWrkMastList);
--
Gitblit v1.9.1