From 97e045fb1271016af2777580b980f974977909f3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 17 五月 2024 09:58:20 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

---
 src/main/java/com/zy/asrs/service/AgvWorkService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index 6946beb..5ce7031 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -39,7 +39,7 @@
     /*
     绌烘澘鍏ュ簱
      */
-    String emptyPlateIn(String station,String containerCode,Short containerType, Long userId);
+    String emptyPlateIn(String station,String containerCode,Short containerType, Long userId, boolean emptyAutoIn);
 
     void emptyPlateOut(String station, int containerType, Long userId);
 
@@ -56,6 +56,6 @@
     /**
      * 鎵嬪姩鍙栨秷宸ヤ綔妗�
      */
-    void cancelWrkMast(String workNo, Long userId);
+    void cancelWrkMast(String workNo, Long userId, Integer type);
 
 }

--
Gitblit v1.9.1