From 178788d231d7d891c1874635b8e11dd951fc4230 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 25 六月 2021 18:10:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/SysReagentService.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
index b51db5b..8404eca 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);
@@ -38,4 +38,18 @@
String getReagentUnitByReagentId(String reagentId);
List<SysReagent> getReagent(String name, String cas, String factory, String specifications, String packing);
+
+ List<SysReagent> selectReagentSafetyNum();
+
+ void updateSafetyNum(SysReagent sysReagent);
+
+ /**
+ * @Description: 根据detail的参数获取试剂id
+ * @date 2021/6/21 9:42
+ */
+ SysReagent getReagentByDetail(Map<String, Object> detail);
+
+ SysReagent getRowData(String rowKey);
+
+ SysReagent getSysReagentListNewRowData(String rowKey);
}
--
Gitblit v1.9.2