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/SysWarehouseService.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
index de87a56..16ccd1d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
@@ -1,6 +1,10 @@
 package com.nanometer.smartlab.service;
 
+import com.nanometer.smartlab.entity.SysLaboratory;
 import com.nanometer.smartlab.entity.SysWarehouse;
+import com.nanometer.smartlab.entity.dto.InWarehouseInfoDto;
+import com.nanometer.smartlab.entity.dto.ReagentReceivingDto;
+import com.nanometer.smartlab.entity.dto.SysWarehouseDto;
 
 import java.util.List;
 
@@ -18,4 +22,11 @@
     public boolean deleteSysWarehouse(List<SysWarehouse> sysWarehouseList);
     public boolean isSysWarehouseExist(String barCode, String editId);
 
+    List<SysWarehouseDto> getWarehouseList();
+
+    void putInWarehouse(InWarehouseInfoDto inWarehouseInfo) throws Exception;
+
+    void reagentReceiving(ReagentReceivingDto reagentReceiving);
+
+    void updateSysWarehouse2(SysWarehouse sysWarehouse, SysLaboratory sysLaboratory);
 }

--
Gitblit v1.9.2