From 06a901e11f9ec144b709efa3610f5abd0e5936d6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 07 四月 2024 09:18:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 118 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 33 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..0667c0f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -18,7 +18,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -115,6 +114,7 @@
}
agvBasDevp.setLocSts("O");
agvBasDevp.setBarcode("");
+ agvBasDevp.setLocType2(null);
agvBasDevpService.update(agvBasDevp,new EntityWrapper<AgvBasDevp>().eq("dev_no",agvBasDevp.getDevNo()));
return R.ok();
@@ -200,42 +200,72 @@
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);
- try {
- int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
- if(code == 0){
- //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
- agvWrkMastList.forEach(agvWrkMast -> {
- agvWrkMast.setWrkSts(206L);
- agvWrkMastService.updateById(agvWrkMast);
- });
- //淇敼绔欑偣鐘舵��
- devNos.forEach(devNo -> {
- AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- agvBasDevp.setBarcode("");
- agvBasDevp.setLocSts("O");
- agvBasDevpService.updateById(agvBasDevp);
- });
- }
- } catch (IOException e) {
- e.printStackTrace();
- return R.error("瀹瑰櫒绂诲満澶辫触");
}
+
+// 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());
+
+ agvWrkMastList.forEach(agvWrkMast -> {
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMastService.updateById(agvWrkMast);
+ });
+
+// try {
+// int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
+// if(code == 0){
+// //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+// agvWrkMastList.forEach(agvWrkMast -> {
+// agvWrkMast.setWrkSts(206L);
+// agvWrkMastService.updateById(agvWrkMast);
+// });
+// //淇敼绔欑偣鐘舵��
+//// devNos.forEach(devNo -> {
+//// AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+//// agvBasDevp.setBarcode("");
+//// agvBasDevp.setLocSts("O");
+//// agvBasDevpService.updateById(agvBasDevp);
+//// });
+// }
+// } catch (IOException e) {
+// e.printStackTrace();
+// return R.error("瀹瑰櫒绂诲満澶辫触");
+// }
return R.ok("瀹瑰櫒绂诲満鎴愬姛");
}
@@ -245,14 +275,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