From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 15:52:09 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index aa6197f..430bbc3 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -1,64 +1,57 @@
 package com.zy.asrs.service;
 
-import com.zy.asrs.entity.AgvWaitPakin;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
-import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvWrkMast;
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
 import com.zy.asrs.entity.param.StockOutParam;
-import com.zy.common.model.LocDetlDto;
 import com.zy.common.model.StartupDto;
 import com.zy.common.model.TaskDto;
-import com.zy.common.model.enums.IoWorkType;
 
 import java.util.List;
 
 public interface AgvWorkService {
 
-    /**
-     * 鍏ㄦ澘鍏ュ簱
-     * @return 搴撲綅鍙�
+    /*
+     閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔�
      */
-    String startupFullPutStore(FullStoreParam param, Long userId);
+    StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor);
 
-    /**
-     * 鍑哄簱浣滀笟
+    /*
+    鐢熸垚鍑哄簱浠诲姟
      */
-    void startupFullTakeStore(StockOutParam param, Long userId);
+    void stockOutWrkMast(List<TaskDto> agvTaskDtos, Long userId);
 
-    /**
-     * 鍑哄簱浣滀笟
+    /*
+    鐢熸垚鍑哄簱浠诲姟
      */
-    void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
+    void processOut(List<TaskDto> agvTaskDtos, Long userId);
 
-    void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
-
-    /**
-     * 绌烘澘鍏ュ簱
-     * @return 搴撲綅鍙�
+    /*
+    鐢熸垚鎷f枡鍏ュ簱浠诲姟
      */
-    String emptyPlateIn(Integer sourceStaNo, Long userId);
+    void pickIn(List<AgvWrkMast> agvWrkMastList);
 
-    /**
-     * 绌烘澘鍑哄簱
-     */
-    void emptyPlateOut(EmptyPlateOutParam param, Long userId);
-
-    /**
-     * 鐩樼偣鍑哄簱
+    /*
+    鐩樼偣鍑哄簱
      */
     void locCheckOut(StockOutParam param, Long userId);
 
-    /**
-     * 搴撲綅绉昏浆
+    /*
+    搴撲綅绉昏浆
      */
-    void locMove(String sourceLocNo, String locNo, Long userId);
+    void locMove(String sourceLocNo, String targetLocNo, Long userId);
 
-    /**
-     * 鎵嬪姩瀹屾垚宸ヤ綔妗�
+    /*
+    绌烘澘鍏ュ簱
      */
-    void completeWrkMast(String workNo, Long userId);
+    String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn);
+
+    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);
 
     /**
      * 搴撳瓨鏄庣粏璋冩暣
@@ -66,28 +59,18 @@
     void adjustLocDetl(LocDetlAdjustParam param, Long userId);
 
     /**
+     * 鎵嬪姩瀹屾垚宸ヤ綔妗�
+     */
+    void completeWrkMast(String workNo, Long userId);
+
+    /**
      * 鎵嬪姩鍙栨秷宸ヤ綔妗�
      */
-    void cancelWrkMast(String workNo, Long userId);
+    void cancelWrkMast(String workNo, Long userId, Integer type);
 
     /**
-     * 鎵嬪姩鎷f枡鍏ュ簱宸ヤ綔妗�
+     * 鍒囨崲璋冩嫧绫诲瀷
      */
-    void pickWrkMast(String workNo, Long userId);
-
-    /**
-     * 閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔�
-     */
-    StartupDto createWaitPainWrkMastStart(List<AgvWaitPakin> list, Long userId);
-
-    /**
-     * 閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔�
-     */
-    String dealPreHaveStart(Integer wrkNo, Long userId);
-
-    /**
-     * 绌挎搴撶Щ杞�
-     */
-    void shuttleTransfer(List<String> locNos);
+    void changeType(String workNo, Long userId);
 
 }

--
Gitblit v1.9.1