From 7cdb188ddd1655cae52c5146db8069d0288a5a97 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期四, 31 七月 2025 12:40:31 +0800 Subject: [PATCH] #erp读取实际数量 --- src/main/java/com/zy/asrs/service/WorkService.java | 66 +++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 7 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..d83ec6a 100644 --- a/src/main/java/com/zy/asrs/service/WorkService.java +++ b/src/main/java/com/zy/asrs/service/WorkService.java @@ -1,11 +1,13 @@ package com.zy.asrs.service; import com.zy.asrs.entity.BasDevp; -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.WaitPakin; +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; +import com.zy.common.model.enums.IoWorkType; import java.util.List; @@ -17,17 +19,32 @@ */ String startupFullPutStore(FullStoreParam param, Long userId); +// /** +// * 鍑哄簱浣滀笟 +// */ +// void startupFullTakeStore(StockOutParam param, Long userId); + /** - * 鍏ㄦ澘鍑哄簱 + * 鍑哄簱浣滀笟 */ - void startupFullTakeStore(StockOutParam param, Long userId); + void startupFullTakeStore(StockOutFloorParam param, 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); + + void stockOut(BasDevp staNo, TaskDto taskDto, Long userId); + + /** + * mes璋冪敤鍑哄簱 + * @param endLocation 鍦扮爜 + */ + void stockOut(BasDevp staNo, TaskDto taskDto, Long userId,String endLocation); /** * 绌烘澘鍏ュ簱 @@ -39,6 +56,23 @@ * 绌烘澘鍑哄簱 */ void emptyPlateOut(EmptyPlateOutParam param, Long userId); + + /** + * 鑷姩绌烘澘鍑哄簱 + * @param param + * @return + */ + public WrkMast emptyPlateOut(EmptyPlateOutParam param); + +// /** +// * 鐩樼偣鍑哄簱 +// */ +// void locCheckOut(StockOutParam param, Long userId); + + /** + * 鐩樼偣鍑哄簱 + */ + void locCheckOut(StockOutFloorParam param, Long userId); /** * 搴撲綅绉昏浆 @@ -59,4 +93,22 @@ * 鎵嬪姩鍙栨秷宸ヤ綔妗� */ 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); + + void turnMatLocDetl(EmptyPlateOutParam param, Long userId); + } -- Gitblit v1.9.1