From f2d6953c01bdf30cc4e2664b2e9b84744ff89c62 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 18 Jun 2021 13:10:22 +0800
Subject: [PATCH] 修复邮件内容
---
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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..051266e 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
@@ -16,21 +16,38 @@
Integer pageSize);
int getOpeWarehouseReserveTotalCount(String reagentId, String supplierId);
List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first,
- Integer pageSize,String productSn);
- int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn);
+ Integer pageSize,String productSn,String warehouseName);
+ int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn,String warehouseName);
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);
+ void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId);
+
+ List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag);
+
+ void btWarehouseReserveReduce(List<OpeApplyReserve> opeList);
+
+ List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId);
+
+ void updateBtReserve(String id,Integer useNum);
+
+ //根据试剂Id查找当前库存
+ int countByReagentId(String id);
}
--
Gitblit v1.9.2