From 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期三, 06 十二月 2023 20:18:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1 --- src/main/java/com/zy/asrs/service/ManLocDetlService.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java index 2cbf39f..83f6cea 100644 --- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java +++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java @@ -5,6 +5,7 @@ import com.zy.asrs.entity.ManLocDetl; import com.zy.asrs.entity.param.LocDetlAdjustParam; import com.zy.asrs.entity.result.StockVo; +import com.zy.common.model.LocDto; import com.zy.system.entity.User; import java.util.List; @@ -13,7 +14,7 @@ public interface ManLocDetlService extends IService<ManLocDetl> { Page<ManLocDetl> getPage(Page<ManLocDetl> page); - ManLocDetl selectItem(String locNo, String matnr, String batch); + ManLocDetl selectItem(String locNo, String matnr, String batch, String csocode, String isoseq, String containerCode); Page<ManLocDetl> getStockOut(Page<ManLocDetl> page); @@ -69,4 +70,6 @@ int increase(Double anfme,String locNo, String matnr,String batch,Double weight); + double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq); + } -- Gitblit v1.9.1