From 4f258638d62ccaae0050f1ed6c7231941b66fb50 Mon Sep 17 00:00:00 2001
From: deslrey <deslre0381@gmail.com>
Date: 星期六, 10 一月 2026 11:29:04 +0800
Subject: [PATCH] 【物料属性】的回显及查询

---
 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java |   58 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
index b074da0..64fd59d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
@@ -11,70 +11,77 @@
 import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
 import com.ruoyi.inspect.vo.InsOrderPlanVO;
 import com.ruoyi.inspect.vo.SampleVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_sample(妫�楠屾牱鍝�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-03-14 17:14:57
-* @Entity com.yuanchu.mom.pojo.InsSample
-*/
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恑ns_sample(妫�楠屾牱鍝�)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2024-03-14 17:14:57
+ * @Entity com.yuanchu.mom.pojo.InsSample
+ */
+@Mapper
 public interface InsSampleMapper extends BaseMapper<InsSample> {
 
     IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page,
                                                 @Param("ew") QueryWrapper<InsOrderPlanDTO> ew,
-                                                @Param("userName") String userName ,
+                                                @Param("userName") String userName,
                                                 @Param("userId") Integer userId,
                                                 @Param("sonLaboratory") String sonLaboratory,
                                                 @Param("laboratory") String laboratory,
-                                                @Param("isCheck") Integer isCheck);
+                                                @Param("isCheck") Integer isCheck,
+                                                @Param("materialProp") String materialProp);
 
     IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
 
-    List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
+    List<SampleProductDto> selectSampleProductListByOrderId(@Param("id") Integer id);
 
-    List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
+    List<SampleProductDto> selectSampleProductListByOrderId2(@Param("id") Integer id);
 
-    Map<String,Object> selectInsOrder(Integer id);
+    Map<String, Object> selectInsOrder(@Param("id") Integer id);
 
-    List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
+    List<SampleProductDto> getInsOrderAndSample(@Param("id") Integer id, @Param("laboratory") String laboratory);
 
-    String getSampleEn(String sample);
+    String getSampleEn(@Param("sample") String sample);
 
     /**
      * 鍙兘娌℃湁浜у搧鐩存帴灏辨槸瀵硅薄
+     *
      * @param sample
      * @return
      */
-    String getSampleEnByObject(String sample);
+    String getSampleEnByObject(@Param("sample") String sample);
 
     /**
      * 鏍峰搧
+     *
      * @param id
      * @param laboratory
      * @return
      */
-    List<InsProduct> getInsProduct1(Integer id, String laboratory, String cableTag, String repetitionTag, String isDisqualification);
+    List<InsProduct> getInsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("repetitionTag") String repetitionTag);
 
 
     /**
      * 鍘熸潗鏂�
+     *
      * @param id
      * @param laboratory
      * @param rawMaterialTag
      * @return
      */
-    List<InsProduct> getInsProduct6(Integer id, String laboratory, String rawMaterialTag, String isDisqualification);
+    List<InsProduct> getInsProduct6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag);
 
-    SampleVo getDetailById(Integer sampleId);
+    SampleVo getDetailById(@Param("sampleId") Integer sampleId);
 
-    String selMethodById(Integer sampleId);
+    String selMethodById(@Param("sampleId") Integer sampleId);
 
     /**
      * 鐢电紗閰嶇疆鏌ョ湅閰嶇疆鏍囪瘑
+     *
      * @param id
      * @param laboratory
      * @return
@@ -83,6 +90,7 @@
 
     /**
      * 鍘熸潗鏂欐煡鐪嬮厤缃爣璇�
+     *
      * @param id
      * @param laboratory
      * @return
@@ -91,6 +99,7 @@
 
     /**
      * 鏌ョ湅閲嶅鏍囪瘑
+     *
      * @param id
      * @param laboratory
      * @return
@@ -98,10 +107,11 @@
     List<Map<String, Object>> getRepetitionTag(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag);
 
 
-    List<SampleProductDto> selectExemptionByOrderId(Integer id);
+    List<SampleProductDto> selectExemptionByOrderId(@Param("id") Integer id);
 
     /**
      * 鏌ヨ鍘傚瀵嗗害(鏈夊瀷鍙�)
+     *
      * @param sample
      * @param production
      * @return
@@ -110,6 +120,7 @@
 
     /**
      * 鏌ヨ鍘傚瀵嗗害(娌″瀷鍙�)
+     *
      * @param sample
      * @param production
      * @return
@@ -119,10 +130,19 @@
 
     /**
      * 鏌ヨ妫�楠岄」妫�楠岀粨鏋�
+     *
      * @param itemIds
      * @return
      */
-    List<InsProduct> selectProductResult(List<Integer> itemIds);
+    List<InsProduct> selectProductResult(@Param("itemIds") List<Integer> itemIds);
+
+    /**
+     * 鏍规嵁璁㈠崟id鏌ヨ鏍峰搧
+     *
+     * @param insOrderId
+     * @return
+     */
+    List<InsSample> getSampleByOrderId(Integer insOrderId);
 }
 
 

--
Gitblit v1.9.3