From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复

---
 src/main/java/com/zy/asrs/service/WorkService.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index c960c17..5a9d859 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,11 +1,17 @@
 package com.zy.asrs.service;
 
 import com.zy.asrs.entity.BasDevp;
+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;
 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 org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -18,16 +24,27 @@
     String startupFullPutStore(FullStoreParam param, Long userId);
 
     /**
-     * 鍏ㄦ澘鍑哄簱
+     * 鍑哄簱浣滀笟
      */
     void startupFullTakeStore(StockOutParam param, Long userId);
 
     /**
      * 鍑哄簱浣滀笟
+     */
+    void startupFullTakeStoreOrder(StockOutParam param, Long userId);
+
+    @Transactional
+    void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId);
+
+    /**
+     * 鍑哄簱浣滀笟
      * @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,String groupOrderNumber);
+
+    void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
 
     /**
      * 绌烘澘鍏ュ簱
@@ -41,9 +58,26 @@
     void emptyPlateOut(EmptyPlateOutParam param, Long userId);
 
     /**
+     * 鑷姩绌烘澘鍑哄簱
+     * @param param
+     * @return
+     */
+    public WrkMast emptyPlateOut(EmptyPlateOutParam param);
+
+    /**
+     * 鐩樼偣鍑哄簱
+     */
+    void locCheckOut(StockOutParam param, Long userId);
+
+    /**
      * 搴撲綅绉昏浆
      */
     void locMove(String sourceLocNo, String locNo, Long userId);
+
+    /**
+     * 璺ㄥ贩閬撳簱浣嶇Щ杞�
+     */
+    void autoLocMove(String orderNo,String sourceLocNo, String locNo, Long userId);
 
     /**
      * 鎵嬪姩瀹屾垚宸ヤ綔妗�
@@ -59,4 +93,22 @@
      * 鎵嬪姩鍙栨秷宸ヤ綔妗�
      */
     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);
+
 }

--
Gitblit v1.9.1