修改哦

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-api</artifactId>
-    <version>1.7</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1735,11 +1735,24 @@
         ATR .SERIAL_NUMBER "text"
         FROM
         AMS_TRANS_REQUIREMENT ATR
+        LEFT JOIN AMS_REQUIREMENT_CHILD ARC
+        ON ARC.TRANS_REQUIREMENT_ID = ATR.TRANS_REQUIREMENT_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ARC.MATERIAL_ID
         <where>
             ATR.DELETED NOT IN (2,5,6)
-            <if test="index!=null and index!=''">
+            <if test="index != null and index != ''">
                 AND REGEXP_LIKE(ATR.SERIAL_NUMBER, #{index})
             </if>
+            <if test="materialCode != null and materialCode!=''">
+                AND REGEXP_LIKE(RM.MATERIAL_CODE, #{materialCode})
+            </if>
+            <if test="receivingCompanyId != null and receivingCompanyId != ''">
+                AND REGEXP_LIKE(ATR.RECEIVING_COMPANY_ID , #{receivingCompanyId})
+            </if>
+            <if test="materialId !=null and materialId != ''">
+                AND REGEXP_LIKE(ARC.MATERIAL_ID, #{materialId})
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
         )