From 901bab9b8b1c3773a644bdc74f5eafd666591aeb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 13:37:24 +0800
Subject: [PATCH] feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制
---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index e732efb..77ac5e8 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -6,9 +6,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
-import com.ruoyi.basic.pojo.StandardMethodList;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.basic.vo.IfsInventoryQuantityVO;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -20,21 +21,53 @@
* @createDate 2024-03-01 15:06:44
* @Entity com.ruoyi.basic.pojo.StandardTree
*/
+@Mapper
public interface StandardTreeMapper extends BaseMapper<StandardTree> {
- List<FactoryDto> selectStandardTreeList();
+ List<StandardLibraryTreeRowDto> selectStandardLibraryTree();
List<StandardTree> selectStandardTreeList2(String sampleType);
+
+ /**
+ * 琛屼笟鏀瑰悕锛氱骇鑱旀洿鏂版爣鍑嗗簱閰嶇疆涓殑琛屼笟鍚嶇О锛屽苟閲嶅缓涓ょ骇瑙勮寖璺緞
+ */
+ int updateProductListIndustry(@Param("oldName") String oldName, @Param("newName") String newName);
+
+ /**
+ * 鏍囧噯鏀瑰悕锛氱骇鑱旀洿鏂版爣鍑嗗簱閰嶇疆涓殑鏍囧噯鍚嶇О锛屽苟閲嶅缓涓ょ骇瑙勮寖璺緞
+ */
+ int updateProductListStandard(@Param("industry") String industry, @Param("oldName") String oldName, @Param("newName") String newName);
+
+ /**
+ * 琛屼笟鏀瑰悕锛氱骇鑱旀洿鏂版湭瀹屾垚璁㈠崟鐨勮涓氬悕绉�
+ */
+ int updateInsOrderIndustry(@Param("oldName") String oldName, @Param("newName") String newName);
+
+ int updateInsSampleIndustry(@Param("oldName") String oldName, @Param("newName") String newName);
+
+ int updateInsProductIndustry(@Param("oldName") String oldName, @Param("newName") String newName);
+
+ /**
+ * 鏍囧噯鏀瑰悕锛氱骇鑱旀洿鏂版湭瀹屾垚璁㈠崟鐨勬爣鍑嗗悕绉�
+ */
+ int updateInsOrderStandard(@Param("industry") String industry, @Param("oldName") String oldName, @Param("newName") String newName);
+
+ int updateInsSampleStandard(@Param("industry") String industry, @Param("oldName") String oldName, @Param("newName") String newName);
+
+ int updateInsProductStandard(@Param("industry") String industry, @Param("oldName") String oldName, @Param("newName") String newName);
StandardProductList selectStandardProductById(Integer id);
List<StandardProductList> getStandardProductListBySample(String sampleType);
- List<StandardMethodList> getStandardMethodListBySample(String sampleType);
-
List<StandardProductList> selectStandardProductListByTree(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
List<StandardProductList> selectStandardProductListByTree2(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
+
+ /**
+ * 鎸夎涓氭煡璇㈠熀纭�妫�楠岄」锛岀敓鎴愪袱绾ф爣鍑嗛厤缃紙sample=鏍囧噯銆乵odel=NULL銆乼ree=瑙勮寖璺緞锛�
+ */
+ List<StandardProductList> selectStandardProductListByIndustry(@Param("industry") String industry, @Param("standard") String standard, @Param("tree") String tree);
List<SampleTypeDto> getStandardTree2();
@@ -49,8 +82,8 @@
List<FactoryDto> selectStandardTreeListByPartNo(@Param("partNo") String partNo);
- IPage<IfsInventoryQuantity> selectIfsPage(IPage<IfsInventoryQuantity> page,
- @Param("ew") QueryWrapper<IfsInventoryQuantity> ew);
+ IPage<IfsInventoryQuantityVO> selectIfsPage(IPage<IfsInventoryQuantity> page,
+ @Param("ew") QueryWrapper<IfsInventoryQuantity> ew);
IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page,
@Param("ew") QueryWrapper<IfsInventoryQuantityDto> ew);
@@ -89,6 +122,21 @@
* @return
*/
List<SampleDto> getStandardTree3Batch(@Param("sampleTypeValues") Set<String> sampleTypeValues);
+
+ /**
+ * 鏌ヨ鏍�
+ * @param sampleType
+ * @return
+ */
+ List<SampleDto> getStandardTree3(@Param("sampleType") String sampleType);
+
+ /**
+ * 鏍规嵁鍘熸潗鏂檌d鍒楄〃鏌ヨ鍘熸潗鏂欎俊鎭�
+ * @param ifsIds
+ * @return
+ */
+ List<IfsInventoryQuantitySupplierDto> getIfsByIds(@Param("ifsIds") List<String> ifsIds);
+
}
--
Gitblit v1.9.3