From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/WorkService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 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 39aef46..9ecc903 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,13 +1,17 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
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.LocDto;
+import com.zy.common.model.StartupDto;
import com.zy.common.model.TaskDto;
+import com.zy.common.model.enums.IoWorkType;
import java.util.List;
@@ -15,6 +19,7 @@
/**
* 鍏ㄦ澘鍏ュ簱
+ *
* @return 搴撲綅鍙�
*/
String startupFullPutStore(FullStoreParam param, Long userId);
@@ -26,16 +31,22 @@
/**
* 鍑哄簱浣滀笟
- * @param staNo 鐩爣绔欑偣
+ *
+ * @param staNo 鐩爣绔欑偣
* @param locDetls 寰呭嚭搴撶墿鏂�
- * @param ioType 鍏ュ嚭搴撶被鍨�
+ * @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);
+ void stockOutSxk(BasDevp staNo, TaskDto taskDto, Long userId);
+
+ void stockOutLibraryType(BasDevp staNo, TaskDto taskDto, Long userId);
+
/**
* 绌烘澘鍏ュ簱
+ *
* @return 搴撲綅鍙�
*/
String emptyPlateIn(Integer sourceStaNo, Long userId);
@@ -46,9 +57,22 @@
void emptyPlateOut(EmptyPlateOutParam param, Long userId);
/**
+ * 鑷姩绌烘澘鍑哄簱
+ *
+ * @param param
+ * @return
+ */
+ public WrkMast emptyPlateOut(EmptyPlateOutParam param);
+
+ /**
* 鐩樼偣鍑哄簱
*/
void locCheckOut(StockOutParam param, Long userId);
+
+ /**
+ * 鐩樼偣鍑哄簱
+ */
+ void locCheckOutsxk(StockOutParam param, Long userId);
/**
* 搴撲綅绉昏浆
@@ -74,4 +98,31 @@
* 鎵嬪姩鎷ｆ枡鍏ュ簱宸ヤ綔妗�
*/
void pickWrkMast(String workNo, Long userId);
+
+ /**
+ * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
+ */
+ StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId);
+
+ /**
+ * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
+ */
+ String dealPreHaveStart(Integer wrkNo, Long userId);
+
+ void turnMatLocDetl(EmptyPlateOutParam param, Long userId);
+
+ /**
+ * 骞舵澘鍑哄簱
+ */
+ void locMergeOut(StockOutParam param, Long userId);
+
+ /**
+ * sxk骞舵澘鍑哄簱
+ */
+ void locMergeOutSxk(StockOutParam param, Long userId);
+
+ void toSxk(WrkMast wrkMastold, List<WrkDetl> wrkDetls, Short locType);
+
+ void toCrn(WrkMast wrkMastold, List<WrkDetl> wrkDetls, Short locType);
+
}
--
Gitblit v1.9.1