From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 4c7ca4c..6987853 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -96,14 +96,14 @@
}
/*
- 绌烘澘鍑哄簱
+ 鍏ュ簱
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
public R pakinEmpty(@RequestBody List<AgvMobileStartParam> params){
for (AgvMobileStartParam param : params){
- workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),getUserId());
+ workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),param.getContainerType(), getUserId());
}
return R.ok();
@@ -114,10 +114,11 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
- public R pakoutEmpty(@RequestBody Map<String,Object> map){
+ public R pakoutEmpty(@RequestBody List<AgvMobileStartParam> params){
- String devNo = map.get("devNo").toString();
-
+ for (AgvMobileStartParam param : params){
+ workService.emptyPlateOut(param.getDevNo(),param.getContainerType(), getUserId());
+ }
return R.ok();
}
--
Gitblit v1.9.1