From 03b5b8a480fb201e288486299eb385a00d2aac66 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 09:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycawdasrs-2' into ycawdasrs-2
---
src/main/java/com/zy/asrs/service/WorkService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index cc6b4eb..d63c4e6 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -10,6 +10,7 @@
import com.zy.common.model.StartupDto;
import com.zy.common.model.TaskDto;
import com.zy.common.model.enums.IoWorkType;
+import com.zy.system.entity.User;
import java.util.List;
@@ -24,7 +25,7 @@
/**
* 鍑哄簱浣滀笟
*/
- void startupFullTakeStore(StockOutParam param, Long userId);
+ void startupFullTakeStore(StockOutParam param, User userId);
/**
* 鍑哄簱浣滀笟
@@ -32,9 +33,12 @@
* @param locDetls 寰呭嚭搴撶墿鏂�
* @param ioType 鍏ュ嚭搴撶被鍨�
*/
- void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId,String agvStaNo);
+ void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, User user,String agvStaNo);
- void stockOut(BasDevp staNo, TaskDto taskDto, Long userId,String agvStaNo);
+ void stockOut(BasDevp staNo, TaskDto taskDto, User user, String agvStaNo);
+
+ void stockOutCheckAnfme(BasDevp staNo, TaskDto taskDto, User user, String agvStaNo);
+
/**
* 绌烘澘鍏ュ簱
@@ -50,7 +54,7 @@
/**
* 鐩樼偣鍑哄簱
*/
- void locCheckOut(StockOutParam param, Long userId);
+ void locCheckOut(StockOutParam param, User userId);
/**
* 搴撲綅绉昏浆
--
Gitblit v1.9.1