From d093cdb0c7a57c09da5eb5d176f9e9e71820fece Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 25 九月 2025 14:01:30 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/service/WorkService.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index f2cc653..6061b62 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,10 +1,16 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
+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 com.zy.system.entity.User;
import java.util.List;
@@ -17,17 +23,19 @@
String startupFullPutStore(FullStoreParam param, Long userId);
/**
- * 鍏ㄦ澘鍑哄簱
- * @return 搴撲綅鍙�
+ * 鍑哄簱浣滀笟
*/
- void startupFullTakeStore(StockOutParam param, Long userId);
+ void startupFullTakeStore(StockOutParam param, User userId);
/**
* 鍑哄簱浣滀笟
* @param staNo 鐩爣绔欑偣
* @param locDetls 寰呭嚭搴撶墿鏂�
+ * @param ioType 鍏ュ嚭搴撶被鍨�
*/
- void stockOut(BasDevp staNo, List<LocDetl> locDetls, Long userId);
+ void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, User user,String agvStaNo);
+
+ void stockOut(BasDevp staNo, TaskDto taskDto, User user, String agvStaNo);
/**
* 绌烘澘鍏ュ簱
@@ -41,6 +49,11 @@
void emptyPlateOut(EmptyPlateOutParam param, Long userId);
/**
+ * 鐩樼偣鍑哄簱
+ */
+ void locCheckOut(StockOutParam param, User userId);
+
+ /**
* 搴撲綅绉昏浆
*/
void locMove(String sourceLocNo, String locNo, Long userId);
@@ -51,7 +64,28 @@
void completeWrkMast(String workNo, Long userId);
/**
+ * 搴撳瓨鏄庣粏璋冩暣
+ */
+ void adjustLocDetl(LocDetlAdjustParam param, Long userId);
+
+ /**
* 鎵嬪姩鍙栨秷宸ヤ綔妗�
*/
void cancelWrkMast(String workNo, Long userId);
+
+ /**
+ * 鎵嬪姩鎷ｆ枡鍏ュ簱宸ヤ綔妗�
+ */
+ void pickWrkMast(String workNo, Long userId);
+
+ /**
+ * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
+ */
+ StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId);
+
+ /**
+ * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
+ */
+ String dealPreHaveStart(Integer wrkNo, Long userId);
+
}
--
Gitblit v1.9.1