From 012f80529db9aa5065f51bde3fd65ff1ffe9eb61 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期日, 07 四月 2024 08:23:10 +0800 Subject: [PATCH] bug修复 --- 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 405b4ea..3683646 100644 --- a/src/main/java/com/zy/asrs/service/WorkService.java +++ b/src/main/java/com/zy/asrs/service/WorkService.java @@ -1,10 +1,16 @@ 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 java.util.List; @@ -17,7 +23,7 @@ String startupFullPutStore(FullStoreParam param, Long userId); /** - * 鍏ㄦ澘鍑哄簱 + * 鍑哄簱浣滀笟 */ void startupFullTakeStore(StockOutParam param, Long userId); @@ -25,8 +31,11 @@ * 鍑哄簱浣滀笟 * @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); /** * 绌烘澘鍏ュ簱 @@ -40,9 +49,31 @@ 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 turnOverOut(EmptyPlateOutParam param, Long userId); + + /** + * 绉讳氦浣滀笟 + */ + void turnOverOutPayment(EmptyPlateOutParam param, Long userId); /** * 鎵嬪姩瀹屾垚宸ヤ綔妗� @@ -50,7 +81,28 @@ void completeWrkMast(String workNo, Long userId); /** + * 搴撳瓨鏄庣粏璋冩暣 + */ + void adjustLocDetl(LocDetlAdjustParam param, Long userId); + + /** * 鎵嬪姩鍙栨秷宸ヤ綔妗� */ void cancelWrkMast(String workNo, Long userId); + + /** + * 鎵嬪姩鎷f枡鍏ュ簱宸ヤ綔妗� + */ + void pickWrkMast(String workNo, Long userId); + + /** + * 閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔� + */ + StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId); + + /** + * 閫氱煡妗f墜鍔ㄧ敓鎴愪换鍔� + */ + String dealPreHaveStart(Integer wrkNo, Long userId); + } -- Gitblit v1.9.1