11/26 药品字典对照条件sql修改

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

@@ -668,16 +668,24 @@
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}
             </if>
-            <if test="filterType != null and filterType == 1">
+            <if test="filterType != null and filterType == 1 and productsType == 1">
                 AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
                 thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
-                <if test="productsType == 1">
-                    and basic_products.originUuid <![CDATA[<>]]> ''
-                </if>
+                and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
-            <if test="filterType != null and filterType == 2">
+            <if test="filterType != null and filterType == 1 and productsType == 2">
+                AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
+                thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                and mainId <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 2  and productsType == 1">
                 AND basic_products.originUuid is NULL
             </if>
+            <if test="filterType != null and filterType == 2 and productsType == 2">
+                AND  (thirdId = '' or  thirdId1 = ''
+                or  thirdId2 = '' or  thirdId3 = ''
+                or  thirdId4 = '') AND  mainId = ''
+            </if>
             <if test="filterType != null and filterType == 3">
                 AND (mainId is NULL or mainId = '')
                 <if test="productsType == 1">

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -25,6 +25,7 @@
                pur_apply_detail.*,
                basic_products.nameCode nameCode,
                basic_products.ggxh     spec,
+               basic_products.bzgg,
                basic_products.packUnit,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,