申购单据产品查询修改，提交采购订单修改

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -75,5 +75,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
 
     private List<String> uuids;
     private List<Integer> ids;
+    private String flbm;
 
 }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -179,14 +179,17 @@
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
                company_product_relevance.unitFk,
-               basic_corp.erpId as customerId,
-               basic_corp.name companyName
+               basic_corp.erpId  as customerId,
+               basic_corp.name      companyName
         FROM basic_udirel
                      inner JOIN basic_products
                 ON basic_products.uuid = basic_udirel.uuid
                      left join company_product_relevance
                 on basic_udirel.id = company_product_relevance.udiRlIdFk
                      left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
+                     left join basic_hosp_type bht on basic_udirel.relCode = bht.code
+                     left join thr_products tp on tp.code = basic_udirel.mainId
+
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@@ -203,6 +206,13 @@
             <if test="pinyinInitial != null and pinyinInitial != ''">
                 AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
             </if>
+            <if test="thrPiId != '' and thrPiId != null">
+                and (thirdId LIKE concat('%', #{thrPiId}, '%')
+                or thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+            </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
@@ -262,6 +272,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="flbm != '' and flbm != null">
+                and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm})
+            </if>
+            <if test="companyName != '' and companyName != null">
+                AND basic_corp.name like concat('%', #{companyName}, '%')
+            </if>
         </where>
     </select>
 
@@ -360,7 +376,7 @@
                 AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
             </if>
             <if test="isDisable == true">
-                AND  basic_udirel.isDisable = true
+                AND basic_udirel.isDisable = true
             </if>
             <if test="thrPiId != '' and thrPiId != null">
                 and (thirdId LIKE concat('%', #{thrPiId}, '%')
@@ -1272,14 +1288,12 @@
     </select>
 
     <select id="selectRelIdByName" resultType="java.lang.String">
-        SELECT
-            b2.id
-        FROM
-            basic_products b1
-        LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
+        SELECT b2.id
+        FROM basic_products b1
+                     LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
         <where>
             <if test="productName != '' and productName != null">
-                AND   b1.cpmctymc like concat('%', #{productName}, '%')
+                AND b1.cpmctymc like concat('%', #{productName}, '%')
             </if>
         </where>
     </select>