From b6a095a76848ffd15922cc4af7f14594fc5bf85d Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 08 十一月 2024 11:16:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs --- src/main/java/com/zy/asrs/service/WorkService.java | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java index 1bd977f..b097f6c 100644 --- a/src/main/java/com/zy/asrs/service/WorkService.java +++ b/src/main/java/com/zy/asrs/service/WorkService.java @@ -1,11 +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; @@ -28,7 +33,9 @@ * @param locDetls 寰呭嚭搴撶墿鏂� * @param ioType 鍏ュ嚭搴撶被鍨� */ - void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, Integer ioType, Long userId, String allotNo, Boolean sell, Double more); + void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId); + + void stockOut(BasDevp staNo, TaskDto taskDto, Long userId); /** * 绌烘澘鍏ュ簱 @@ -40,6 +47,13 @@ * 绌烘澘鍑哄簱 */ void emptyPlateOut(EmptyPlateOutParam param, Long userId); + + /** + * 鑷姩绌烘澘鍑哄簱 + * @param param + * @return + */ + public WrkMast emptyPlateOut(EmptyPlateOutParam param); /** * 鐩樼偣鍑哄簱 @@ -70,4 +84,21 @@ * 鎵嬪姩鎷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); + + /** + * 骞舵澘鍑哄簱 + */ + void locMergeOut(StockOutParam param, Long userId); } -- Gitblit v1.9.1