From b5768fb9a6bf4216aba11d7f784e8cefc8fdaf9b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 三月 2024 14:54:48 +0800
Subject: [PATCH] 定时任务完成
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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..15ec11f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -54,7 +54,8 @@
public R combBinding(@RequestBody Map<String,Object> map){
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
- agvMobileService.combBinding(barcode,stationCode);
+ Short containerType = Short.valueOf(map.get("containerType").toString());
+ agvMobileService.combBinding(barcode,stationCode,containerType);
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
@@ -96,14 +97,14 @@
}
/*
- 绌烘澘鍑哄簱
+ 鍏ュ簱
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
- public R pakinEmpty(@RequestBody List<AgvMobileStartParam> params){
+ public R pakinEmpty(@RequestBody AgvMobileStartParam params){
- for (AgvMobileStartParam param : params){
- workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),getUserId());
+ for (AgvMobileStartParam.Pda pda : params.getPad()) {
+ workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());
}
return R.ok();
@@ -114,10 +115,11 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
- public R pakoutEmpty(@RequestBody Map<String,Object> map){
+ public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
- String devNo = map.get("devNo").toString();
-
+ for (AgvMobileStartParam.Pda pda : params.getPad()) {
+ workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
+ }
return R.ok();
}
--
Gitblit v1.9.1