From 2b480586814e907e6237a87f0022b92fa04dfe7a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 02 七月 2025 16:44:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/WorkService.java |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 490e1d2..d83ec6a 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -2,10 +2,8 @@
 
 import com.zy.asrs.entity.BasDevp;
 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.asrs.entity.WrkMast;
+import com.zy.asrs.entity.param.*;
 import com.zy.common.model.LocDetlDto;
 import com.zy.common.model.StartupDto;
 import com.zy.common.model.TaskDto;
@@ -21,10 +19,16 @@
      */
     String startupFullPutStore(FullStoreParam param, Long userId);
 
+//    /**
+//     * 鍑哄簱浣滀笟
+//     */
+//    void startupFullTakeStore(StockOutParam param, Long userId);
+
     /**
      * 鍑哄簱浣滀笟
      */
-    void startupFullTakeStore(StockOutParam param, Long userId);
+    void startupFullTakeStore(StockOutFloorParam param, Long userId);
+
 
     /**
      * 鍑哄簱浣滀笟
@@ -35,6 +39,12 @@
     void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
 
     void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
+
+    /**
+     * mes璋冪敤鍑哄簱
+     * @param endLocation 鍦扮爜
+     */
+    void stockOut(BasDevp staNo, TaskDto taskDto, Long userId,String endLocation);
 
     /**
      * 绌烘澘鍏ュ簱
@@ -48,9 +58,21 @@
     void emptyPlateOut(EmptyPlateOutParam param, Long userId);
 
     /**
+     * 鑷姩绌烘澘鍑哄簱
+     * @param param
+     * @return
+     */
+    public WrkMast emptyPlateOut(EmptyPlateOutParam param);
+
+//    /**
+//     * 鐩樼偣鍑哄簱
+//     */
+//    void locCheckOut(StockOutParam param, Long userId);
+
+    /**
      * 鐩樼偣鍑哄簱
      */
-    void locCheckOut(StockOutParam param, Long userId);
+    void locCheckOut(StockOutFloorParam param, Long userId);
 
     /**
      * 搴撲綅绉昏浆
@@ -81,4 +103,12 @@
      * 閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔�
      */
     StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId);
+
+    /**
+     * 閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔�
+     */
+    String dealPreHaveStart(Integer wrkNo, Long userId);
+
+    void turnMatLocDetl(EmptyPlateOutParam param, Long userId);
+
 }

--
Gitblit v1.9.1