From 730443b70de88d328ffa275f51f69280fda979e4 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 12:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
index d7b39ed..f8236fc 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -28,6 +28,25 @@
IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);
/**
+ * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
+ * @param name
+ * @param mcode
+ * @param specifications
+ * @return
+ */
+ List<Integer> chooseVer(String name, String mcode, String specifications);
+
+ /**
+ * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�-->鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�
+ * @param name
+ * @param mcode
+ * @param specifications
+ * @param version
+ * @return
+ */
+ List<Map<String,Object>> lookProByVer(String name, String mcode, String specifications, Integer version,String experiment);
+
+ /**
* 鏂板妫�楠岀敵璇疯〃
* @param id
* @param
@@ -50,5 +69,21 @@
* @return
*/
String delInspect(Integer id);
+
+ /**
+ * 淇濆瓨妫�楠岄」鐩矗浠讳汉
+ * @param id
+ * @param userProId
+ * @return
+ */
+ String chooseUseProId(Integer id, Integer userProId);
+
+ /**
+ * 淇濆瓨璁惧
+ * @param id
+ * @param equipmentId
+ * @return
+ */
+ boolean chooseEquipment(Integer id, Integer equipmentId);
}
--
Gitblit v1.9.3