From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期

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

diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index cdc2396..430bbc3 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -2,7 +2,6 @@
 
 import com.zy.asrs.entity.AgvBasDevp;
 import com.zy.asrs.entity.AgvWrkMast;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
 import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.common.model.StartupDto;
@@ -15,12 +14,17 @@
     /*
      閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔�
      */
-    StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId);
+    StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor);
 
     /*
     鐢熸垚鍑哄簱浠诲姟
      */
     void stockOutWrkMast(List<TaskDto> agvTaskDtos, Long userId);
+
+    /*
+    鐢熸垚鍑哄簱浠诲姟
+     */
+    void processOut(List<TaskDto> agvTaskDtos, Long userId);
 
     /*
     鐢熸垚鎷f枡鍏ュ簱浠诲姟
@@ -40,13 +44,33 @@
     /*
     绌烘澘鍏ュ簱
      */
-    String emptyPlateIn(String sourceStaion, Long userId);
+    String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn);
 
-    void emptyPlateOut(EmptyPlateOutParam param, Long userId);
+    String emptyPlateInV2(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn,String factory);
+
+    String emptyPlateInV3(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn);
+
+
+    void emptyPlateOut(String station, int containerType, Long userId);
 
     /**
      * 搴撳瓨鏄庣粏璋冩暣
      */
     void adjustLocDetl(LocDetlAdjustParam param, Long userId);
 
+    /**
+     * 鎵嬪姩瀹屾垚宸ヤ綔妗�
+     */
+    void completeWrkMast(String workNo, Long userId);
+
+    /**
+     * 鎵嬪姩鍙栨秷宸ヤ綔妗�
+     */
+    void cancelWrkMast(String workNo, Long userId, Integer type);
+
+    /**
+     * 鍒囨崲璋冩嫧绫诲瀷
+     */
+    void changeType(String workNo, Long userId);
+
 }

--
Gitblit v1.9.1