From 1afdf3622484b9a54c4cc4642e38bbf5c815884f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 04 二月 2021 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/SysReagentService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
index 66ba215..775a88f 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
@@ -20,12 +20,12 @@
public int insertSysReagentList(List<SysReagent> sysReagentList);
public int insertSysReagentList2(List<SysReagent> sysReagentList);
- int getSysReagentTotalCountNew(String name, String cas, String supplierId, Integer type);
+ int getSysReagentTotalCountNew(String name, String cas, String supplierId, Integer type,String productSn);
public List<SysReagent> query();
Map getReagentDetail(String id);
- public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId, Integer type, Integer first, Integer pageSize);
+ public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId, Integer type, Integer first, Integer pageSize,String productSn);
int favorCount(SysUser user, String name, String cas, String supplierId, String productSn,Integer favorFlag);
@@ -33,7 +33,9 @@
int reagentCount(SysUser user, String name, String cas, String supplierId, String productSn);
- List<SysReagent> reagentList(SysUser user, String name, String cas, String supplierId, String productSn, int first, int pageSize);
+ List<SysReagent> reagentList(SysUser user, String name, String cas, String supplierId, String productSn, int first, int pageSize,int count);
String getReagentUnitByReagentId(String reagentId);
+
+ List<SysReagent> getReagent(String name, String cas, String factory, String specifications, String packing);
}
--
Gitblit v1.9.2