From d339f7f3a50fe4bf5f8e48e932472ebada852e86 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 14:14:47 +0800
Subject: [PATCH] 备货领取 订单取消保存

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
index f56d677..df8cdec 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
@@ -11,9 +11,10 @@
  */
 public interface SysLaboratoryContainerService {
 
-    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId, Integer first, Integer pageSize);
+    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId
+            ,String project,String controllerName, Integer first, Integer pageSize);
     List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryId);
-    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId);
+    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId,String project,String controllerName);
     SysLaboratoryContainer getSysLaboratoryContainer(String id);
     SysLaboratoryContainer getSysLaboratoryContainerByContainerCode(String containerCode);
     SysLaboratoryContainer insertSysLaboratoryContainer(SysLaboratoryContainer sysLaboratory);
@@ -29,4 +30,11 @@
     List<Map> getContainerPersonInCharge(String containerCode);
 
     Map selectLocationByContainerCode(String containerCode);
+
+    List<Map> exportExcelList(String laboratoryType, String laboratoryName);
+
+    void export2Excel(List<Map> list) throws Exception;
+
+    List<String> selectProjectsByContainerCode(String containerCode);
+
 }

--
Gitblit v1.9.2