From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期三, 27 一月 2021 16:54:34 +0800 Subject: [PATCH] 合并 --- src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java index d7f1d38..07a1fdd 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java @@ -20,17 +20,31 @@ int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn); OpeWarehouseReserve getOpeWarehouseReserve(String reagentId, String articleNumber); OpeWarehouseReserve getOpeWarehouseReserve2(String reagentId, String articleNumber,String warehouseId); + + List<OpeWarehouseReserve> getOpeWarehouseReserveList(String reagentId, String articleNumber,String warehouseId); OpeWarehouseReserve getOpeWarehouseReserveBy(String reagentId, String articleNumber); OpeWarehouseReserve insertOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve); boolean updateOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve); void claim(List<OpeWarehouseReserve> selectedList, String userId,String projectNum); - void claimForPerson(List<OpeApplyReserve> selectedListForPerson, String userId,String projectNum); + void claimForPerson(List<OpeApplyReserve> selectedListForPerson, String userId,String projectNum,String laboratoryId,String laboratoryContainerId); void reagentDStore(List<OpeApply> reagentDStoreList, String loginUserId); void reagentDStore2(List<OpeApply> reagentDStoreList, String loginUserId); + + void reagentDStore3(List<OpeApply> reagentDStoreList, String loginUserId); + + void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId); public List<OpeWarehouseReserve> selectByReId(String id); public void updateByReId(String newReId,String oldReId); void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo); + + List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag); + + void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId); + + List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId); + + void updateBtReserve(String id,Integer useNum); } -- Gitblit v1.9.2