From a23b44f21f596c5500bda617050aa72125e2e701 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 07 十月 2023 12:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 75 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 241d8cd..30f4914 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -158,6 +158,9 @@
return R.ok();
}
+ /*
+ 绔欑偣鏄庣粏
+ */
@RequestMapping(value = "/basDevp/detail/list/auth")
public R basDevpDetailList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -167,7 +170,7 @@
if("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())){
//鍏堝幓鍏ュ簱閫氱煡妗ｆ壘鏄庣粏
Page<AgvWaitPakin> agvWaitPakinPage = agvWaitPakinService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWaitPakin>()
- .eq("zpallet", agvBasDevp.getBarcode()));
+ .eq("supp_code", agvBasDevp.getBarcode()));
if(agvWaitPakinPage.getRecords().size()>0){
return R.ok(agvWaitPakinPage);
}else {
@@ -185,14 +188,13 @@
}
}
- return R.error("鏁版嵁寮傚父");
+ return R.ok();
}
@RequestMapping(value = "/basDevp/visualized/list/auth")
public R visualizedList(@RequestBody JSONObject param){
String stationCode = param.get("stationCode").toString();
-
Map<String, Object> result = agvBasDevpService.getAgvBasDevpDtoByStationCode(stationCode);
@@ -204,22 +206,41 @@
*/
@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));
+ 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() == 103){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�103.鎷ｆ枡鍏ュ簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ 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);
if(code == 0){
//灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
agvWrkMastList.forEach(agvWrkMast -> {
- agvWrkMast.setWrkSts(207L);
+ agvWrkMast.setWrkSts(206L);
agvWrkMastService.updateById(agvWrkMast);
});
//淇敼绔欑偣鐘舵��
@@ -239,18 +260,38 @@
}
/*
- 鎷ｆ枡鍏ュ簱
+ 鎷ｆ枡/鐩樼偣鍏ュ簱
*/
@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 -> {
+ 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));
+ 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));
if(agvWrkMast.getIoType() == 101){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍏ュ簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
- return agvWrkMast;
- }).collect(Collectors.toList());
+ 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