From 0d30daf9ee89603b97c6181c2949abbb89bd64c4 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 13:37:10 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

---
 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..56c60df 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.containerMoveIn(agvWrkMastList);
 
         if(code == 0){
             agvWrkMastList.forEach(agvWrkMast -> {

--
Gitblit v1.9.1