From 20bd270fbecc8356a17b1b429eb97abe1a48700e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 16:43:37 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/WorkService.java |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index e6e594e..b3540d2 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,10 +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.StartupDto;
+import com.zy.common.model.TaskDto;
+import com.zy.common.model.enums.IoWorkType;
 
 import java.util.List;
 
@@ -17,8 +24,7 @@
     String startupFullPutStore(FullStoreParam param, Long userId);
 
     /**
-     * 鍏ㄦ澘鍑哄簱
-     * @return 搴撲綅鍙�
+     * 鍑哄簱浣滀笟
      */
     void startupFullTakeStore(StockOutParam param, Long userId);
 
@@ -26,8 +32,13 @@
      * 鍑哄簱浣滀笟
      * @param staNo 鐩爣绔欑偣
      * @param locDetls 寰呭嚭搴撶墿鏂�
+     * @param ioType 鍏ュ嚭搴撶被鍨�
      */
-    void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, 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);
 
     /**
      * 绌烘澘鍏ュ簱
@@ -41,6 +52,23 @@
     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);
+
+    /**
      * 搴撲綅绉昏浆
      */
     void locMove(String sourceLocNo, String locNo, Long userId);
@@ -51,7 +79,44 @@
     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);
+
+    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