From 65cc55a45a7235ee3736dcc8f4bdee30fdbfb9a7 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 21 二月 2025 08:25:40 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/AgvWorkService.java | 22 +++++++++++++++++-----
1 files changed, 17 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..06bafe4 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 @@
/*
閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
*/
- 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);
/*
鐢熸垚鎷ｆ枡鍏ュ簱浠诲姟
@@ -40,9 +44,12 @@
/*
绌烘澘鍏ュ簱
*/
- 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);
+
+
+ void emptyPlateOut(String station, int containerType, Long userId);
/**
* 搴撳瓨鏄庣粏璋冩暣
@@ -57,6 +64,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