From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
index 36737c4..7f3b285 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
@@ -4,6 +4,7 @@
import com.nanometer.smartlab.entity.OpeApply;
import com.nanometer.smartlab.entity.OpeApplyReserve;
+import com.nanometer.smartlab.entity.OpeOrder;
import com.nanometer.smartlab.entity.OpeWarehouseReserve;
/**
@@ -15,19 +16,40 @@
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,String receiptNumber);
+
public List<OpeWarehouseReserve> selectByReId(String id);
public void updateByReId(String newReId,String oldReId);
+
+ 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);
+
+ OpeWarehouseReserve getRowData(String rowKey);
}
--
Gitblit v1.9.2