From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index a6cc241..b72a706 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -165,9 +165,9 @@
if (Cools.isEmpty(agvWrkMastList)){
return R.error();
}
- Map<String, List<Map<String, String>>> containerMoveParam = agvWrkMastService.startWrk(agvWrkMastList);
+ int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
- int code = agvWrkMastService.containerMove(containerMoveParam);
+ int code = agvWrkMastService.containerMove(agvWrkMastList);
if(code == 0){
agvWrkMastList.forEach(agvWrkMast -> {
--
Gitblit v1.9.1