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 | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java index 9056644..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,9 +44,14 @@ /* 绌烘澘鍏ュ簱 */ - 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); /** * 搴撳瓨鏄庣粏璋冩暣 @@ -57,6 +66,11 @@ /** * 鎵嬪姩鍙栨秷宸ヤ綔妗� */ - void cancelWrkMast(String workNo, Long userId); + void cancelWrkMast(String workNo, Long userId, Integer type); + + /** + * 鍒囨崲璋冩嫧绫诲瀷 + */ + void changeType(String workNo, Long userId); } -- Gitblit v1.9.1