2025-05-26

技术参数卡copy优化

src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java

@@ -1224,8 +1224,8 @@ public class TechnicalSpecificationController {
     @PostMapping(value="/searchCopyPart")
     @ResponseBody
     public R searchCopyPart(@RequestBody PlmTechnicalSpecificationSheetData data) {
-        List<PlmProjectPartData> rows= technicalSpecificationService.searchCopyPart(data);
-        return R.ok().put("rows",rows);
+        PageUtils page = technicalSpecificationService.searchCopyPart(data);
+        return R.ok().put("page", page);
     }
 
     /**

src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@@ -1155,7 +1155,7 @@ public interface TechnicalSpecificationMapper {
 
     PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
 
-    List<PlmProjectPartData> searchCopyPart(PlmTechnicalSpecificationSheetData inData);
+    IPage<PlmProjectPartData> searchCopyPart(Page<PlmTechnicalSpecificationSheetData> technicalSpecificationDataPage, @Param("query") PlmTechnicalSpecificationSheetData data);
 
     String queryCustomerPartNo(@Param("site") String site,
                                @Param("partNo") String partNo,

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -1479,8 +1479,11 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     }
 
     @Override
-    public List<PlmProjectPartData> searchCopyPart(PlmTechnicalSpecificationSheetData inData){
-        return technicalSpecificationMapper.searchCopyPart(inData);
+    public PageUtils searchCopyPart(PlmTechnicalSpecificationSheetData inData){
+        // 技术参数卡中的copy功能，不管控到项目，可以copy到任意项目中的物料 -- 2025-05-26
+        //return technicalSpecificationMapper.searchCopyPart(inData);
+        IPage<PlmProjectPartData> resultList = this.technicalSpecificationMapper.searchCopyPart(new Page<PlmTechnicalSpecificationSheetData>(inData.getPage(), inData.getLimit()), inData);
+        return new PageUtils(resultList);
     }
 
     @Override

src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java

@@ -975,7 +975,7 @@ public interface TechnicalSpecificationService {
 
     PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
 
-    List<PlmProjectPartData> searchCopyPart(PlmTechnicalSpecificationSheetData inData);
+    PageUtils searchCopyPart(PlmTechnicalSpecificationSheetData inData);
 
 
     void copyBm (PlmTechnicalSpecificationSheetData data);

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -2256,20 +2256,46 @@
 
 
     <select id="searchCopyPart" resultType="PlmProjectPartData">
-        Select a.Final_Part_No, a.Test_part_no, a.Active, a.Part_desc, a.project_id, pcpi.customer_part_no, a.bu_no
+        Select
+            a.Final_Part_No,
+            a.Test_part_no,
+            a.Active,
+            a.Part_desc,
+            a.project_id,
+            pcpi.customer_part_no,
+            a.bu_no
         from plm_project_info c
-                 left join view_Project_Part a on a.site = c.site and a.project_id = c.project_id
-                 left join plm_customer_part_info pcpi
-                           on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
-                 left join part p on a.Final_Part_No = p.part_no
-                 left join plm_technical_specification_sheet ps on a.site = ps.site and a.Test_part_no = ps.Test_part_no
-
-        where a.project_id = #{projectId}
-          and a.site = #{site}
-          and a.Test_part_no != #{testPartNo}
-          and a.realFlag = 'Y'
-          and ps.Test_part_no is null
-          and dbo.Get_PartHasRealBOMRoute(a.site, a.Final_Part_No) = 'Y'
+        left join view_Project_Part a on a.site = c.site and a.project_id = c.project_id
+        left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
+        left join part p on a.Final_Part_No = p.part_no
+        left join plm_technical_specification_sheet ps on a.site = ps.site and a.Test_part_no = ps.Test_part_no
+        <where>
+            a.site = #{query.site}
+            <if test = "query.buNo != null and query.buNo != ''">
+                AND a.bu_no = #{query.buNo}
+            </if>
+            <if test = "query.finalPartNo != null and query.finalPartNo != ''">
+                AND a.Final_Part_No LIKE #{query.finalPartNo}
+            </if>
+            <if test = "query.testPartNo != null and query.testPartNo != ''">
+                AND a.Test_Part_No LIKE #{query.testPartNo}
+            </if>
+            <if test = "query.projectId != null and query.projectId != ''">
+                AND a.project_id LIKE #{query.projectId}
+            </if>
+            <if test = "query.customerPartNo != null and query.customerPartNo != ''">
+                AND pcpi.customer_part_no LIKE #{query.customerPartNo}
+            </if>
+            and a.realFlag = 'Y'
+            and ps.Test_part_no is null
+            and dbo.Get_PartHasRealBOMRoute(a.site, a.Final_Part_No) = 'Y'
+        </where>
+<!--            a.project_id = #{projectId}-->
+<!--            and a.site = #{site}-->
+<!--            and a.Test_part_no != #{testPartNo}-->
+<!--            and a.realFlag = 'Y'-->
+<!--            and ps.Test_part_no is null-->
+<!--            and dbo.Get_PartHasRealBOMRoute(a.site, a.Final_Part_No) = 'Y'-->
     </select>
 
     <select id="queryCustomerPartNo" resultType="java.lang.String">