From 94e38780aaaca83dcec2935109b9399f977f3cc4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 15 十二月 2022 16:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs
---
src/main/java/com/zy/asrs/service/WorkService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index e291128..239535b 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -9,6 +9,7 @@
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;
@@ -31,7 +32,7 @@
* @param locDetls 寰呭嚭搴撶墿鏂�
* @param ioType 鍏ュ嚭搴撶被鍨�
*/
- void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, Integer ioType, Long userId);
+ void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
@@ -80,4 +81,10 @@
* 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
*/
StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId);
+
+ /**
+ * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
+ */
+ String dealPreHaveStart(Integer wrkNo, Long userId);
+
}
--
Gitblit v1.9.1