From 114657d034c80ca40f08d767a71d169c34bde0b5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 16 四月 2024 23:50:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 108 +++++++++++++++--------------------------------------
1 files changed, 31 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 1d493bc..968f3eb 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -19,7 +19,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@RequestMapping("/agv")
@@ -114,6 +113,7 @@
}
agvBasDevp.setLocSts("O");
agvBasDevp.setBarcode("");
+ agvBasDevp.setLocType2(null);
agvBasDevpService.update(agvBasDevp,new EntityWrapper<AgvBasDevp>().eq("dev_no",agvBasDevp.getDevNo()));
return R.ok();
@@ -211,60 +211,33 @@
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut")
public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
- 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.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
- }
- agvWrkMastList.add(agvWrkMast);
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+ if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
-// 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());
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMastService.updateById(agvWrkMast);
- agvWrkMastList.forEach(agvWrkMast -> {
- agvWrkMast.setWrkSts(206L);
- agvWrkMastService.updateById(agvWrkMast);
- });
+ return R.ok("瀹瑰櫒绂诲満鎴愬姛");
+ }
-// 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("瀹瑰櫒绂诲満澶辫触");
-// }
+ /*
+ 浠诲姟瀹屾垚
+ */
+ @RequestMapping(value = "/basDevp/visualized/container/moveOut2")
+ public R visualiZedContainerMoveOut2(@RequestBody Map<String,Object> map) {
+
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+ if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+
+ agvWrkMast.setWrkSts(208L);
+ agvWrkMastService.updateById(agvWrkMast);
return R.ok("瀹瑰櫒绂诲満鎴愬姛");
}
@@ -274,36 +247,17 @@
*/
@RequestMapping(value = "/basDevp/visualized/container/pickIn")
public R visualiZedPickIn(@RequestBody Map<String,Object> map){
- 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);
+ String devNo = map.get("devNo").toString();
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+ if (agvWrkMast != null) {
+ if(agvWrkMast.getIoType() == 101){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
+ agvWrkMast.setLocNo(devNo);
+ agvWrkMastList.add(agvWrkMast);
}
-
-// 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