From 0fb180ce609b9a045dacc409975527b7728640fa Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 31 五月 2024 17:55:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 2dd57fc..c1a6a5c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -259,7 +259,7 @@
鎷ｆ枡/鐩樼偣鍏ュ簱
*/
@RequestMapping(value = "/basDevp/visualized/container/pickIn")
- @ManagerAuth(memo = "鍐嶆鎷ｆ枡")
+ @ManagerAuth(memo = "宸叉嫞鏂欏洖搴�")
public R visualiZedPickIn(@RequestBody Map<String,Object> map){
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
String devNo = map.get("devNo").toString();
@@ -271,11 +271,14 @@
}
agvWrkMast.setLocNo(devNo);
agvWrkMastList.add(agvWrkMast);
+ agvWorkService.pickIn(agvWrkMastList);
+ } else {
+ return R.error("鏌ヤ笉鍒版嫞鏂欏嚭搴撲换鍔�");
}
- agvWorkService.pickIn(agvWrkMastList);
- return R.ok("鐢熸垚鎷ｆ枡鍑哄簱浠诲姟鎴愬姛");
+
+ return R.ok("鐢熸垚鎷ｆ枡鍥炲簱浠诲姟鎴愬姛");
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1