From 6984757bfc75b4a25014de1eb71c2aa75ebdb86f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 八月 2023 15:59:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index ff4ec4e..bb0de57 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -24,8 +24,19 @@
     List<Map> selectProductByMaterialId(int materialId);
 
     //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
-    List<Map<String, Object>> pageProductInformation(Integer specificationsId);
+    List<Map<String, Object>> pageProductInformation(Integer specificationsId,Integer version);
 
+    void deleteList(String ids);
 
+    //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->閫夋嫨鐗堟湰
+    List<Integer> chooseVersion(Integer specificationsId);
 
+    //鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
+    List<Map<String,Object>> chooseProject(Integer modelId);
+
+    //鏍规嵁椤圭洰鐖剁被,鍨嬪彿id,鐗堟湰鏌ヨ浜岀骇璇︽儏
+    List<Map<String, Object>> selFath(Integer specificationId, String exper, Integer version);
+
+    //鏍规嵁椤圭洰鐖剁被涓虹┖,椤圭洰鍚�,鍨嬪彿id,鐗堟湰鏌ヨ
+    Map<String, Object> selNam(Integer specificationId, String exper, Integer version);
 }

--
Gitblit v1.9.3