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/service/AgvWorkService.java | 84 ++++++++++++++---------------------------
1 files changed, 29 insertions(+), 55 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..b3ddaa6 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -1,64 +1,48 @@
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.AgvBasDevp;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
-import com.zy.asrs.entity.param.FullStoreParam;
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 搴撲綅鍙�
+ /*
+ 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
*/
- 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 pickIn(List<AgvWrkMast> agvWrkMastList);
- void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
-
- /**
- * 绌烘澘鍏ュ簱
- * @return 搴撲綅鍙�
- */
- String emptyPlateIn(Integer sourceStaNo, Long userId);
-
- /**
- * 绌烘澘鍑哄簱
- */
- 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 sourceStaion, Long userId);
+
+ void emptyPlateOut(EmptyPlateOutParam param, Long userId);
/**
* 搴撳瓨鏄庣粏璋冩暣
@@ -66,28 +50,18 @@
void adjustLocDetl(LocDetlAdjustParam param, Long userId);
/**
+ * 鎵嬪姩瀹屾垚宸ヤ綔妗�
+ */
+ void completeWrkMast(String workNo, Long userId);
+
+ /**
* 鎵嬪姩鍙栨秷宸ヤ綔妗�
*/
void cancelWrkMast(String workNo, Long userId);
- /**
- * 鎵嬪姩鎷ｆ枡鍏ュ簱宸ヤ綔妗�
+ /*
+ 鎵嬪姩杞嚭搴撲换鍔★紝骞朵笖瀹瑰櫒绂诲満
*/
- void pickWrkMast(String workNo, Long userId);
-
- /**
- * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
- */
- StartupDto createWaitPainWrkMastStart(List<AgvWaitPakin> list, Long userId);
-
- /**
- * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
- */
- String dealPreHaveStart(Integer wrkNo, Long userId);
-
- /**
- * 绌挎搴撶Щ杞�
- */
- void shuttleTransfer(List<String> locNos);
+ void changeToOutWrkMast(String workNo, Long userId);
}
--
Gitblit v1.9.1