From 7b72d43503aa5df4c152b777777085d3cd5e2132 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 06 十二月 2025 15:49:25 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/service/WorkService.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 f5c0c1f..ab0c49e 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,7 +1,9 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.WaitPakin;
+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;
@@ -27,6 +29,11 @@
void startupFullTakeStore(StockOutParam param, Long userId);
/**
+ * 瀹㈡埛杞崲
+ */
+ void turnOverOut(EmptyPlateOutParam param, Long userId);
+
+ /**
* 鍑哄簱浣滀笟
* @param staNo 鐩爣绔欑偣
* @param locDetls 寰呭嚭搴撶墿鏂�
@@ -35,6 +42,10 @@
void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
+
+ void checkStockOut(BasDevp staNo, TaskDto taskDto, Long userId);
+
+ void agvStockOut(BasStation staNo, TaskDto taskDto, Long userId);
/**
* 绌烘澘鍏ュ簱
@@ -46,6 +57,13 @@
* 绌烘澘鍑哄簱
*/
void emptyPlateOut(EmptyPlateOutParam param, Long userId);
+
+ /**
+ * 鑷姩绌烘澘鍑哄簱
+ * @param param
+ * @return
+ */
+ public WrkMast emptyPlateOut(EmptyPlateOutParam param);
/**
* 鐩樼偣鍑哄簱
@@ -85,6 +103,8 @@
/**
* 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
*/
- StartupDto dealPreHaveStart(Integer wrkNo, Long userId);
+ String dealPreHaveStart(Integer wrkNo, Long userId);
+
+ void turnMatLocDetl(EmptyPlateOutParam param, Long userId);
}
--
Gitblit v1.9.1