From 940cab832331ab054d2a4c74f13aacc6847dd79d Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 08:43:26 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/AgvWorkService.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index f97aa5d..190b1df 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -2,6 +2,8 @@
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.StartupDto;
import com.zy.common.model.TaskDto;
@@ -12,7 +14,7 @@
/*
閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
*/
- StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId);
+ StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor);
/*
鐢熸垚鍑哄簱浠诲姟
@@ -20,9 +22,50 @@
void stockOutWrkMast(List<TaskDto> agvTaskDtos, Long userId);
/*
+ 鐢熸垚鍑哄簱浠诲姟
+ */
+ void processOut(List<TaskDto> agvTaskDtos, Long userId);
+
+ /*
鐢熸垚鎷ｆ枡鍏ュ簱浠诲姟
*/
void pickIn(List<AgvWrkMast> agvWrkMastList);
+ /*
+ 鐩樼偣鍑哄簱
+ */
+ void locCheckOut(StockOutParam param, Long userId);
+
+ /*
+ 搴撲綅绉昏浆
+ */
+ void locMove(String sourceLocNo, String targetLocNo, Long userId);
+
+ /*
+ 绌烘澘鍏ュ簱
+ */
+ String emptyPlateIn(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