From a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 03 二月 2021 16:10:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java |    9 +++++++++
 1 files changed, 9 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..92550d7 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
@@ -1,6 +1,9 @@
 package com.nanometer.smartlab.service;
 
 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 +21,10 @@
     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);
+
 }

--
Gitblit v1.9.2