From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 01 二月 2021 10:19:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java index e1dcab6..f8ea1b4 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java @@ -38,11 +38,11 @@ public List<OpeWarehouseReserve> selectByReId(String id); public void updateByReId(String newReId,String oldReId); - void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo); + void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId); List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag); - void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId); + void btWarehouseReserveReduce(List<OpeApplyReserve> opeList); List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId); -- Gitblit v1.9.2