Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z

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

@@ -90,4 +90,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private Integer codeCheck;
 
     private Integer productsType = 1;//默认是耗材
+
+    private String keyWords;
 }

src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java

@@ -71,4 +71,6 @@ public class PurApplyDetailRequest extends ListPageRequest {
 
     private Integer pageType;
     private Integer productType;
+    private String keyWords;
+
 }

src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java

@@ -83,4 +83,6 @@ public class PurOrderDetailRequest extends ListPageRequest {
     private Integer pageType;
     private Integer productType;
 
+    private String keyWords;
+
 }

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

@@ -145,7 +145,9 @@
                 AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat('%', #{ggxh}, '%')
+                and (
+                basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
+                or basic_products.bzgg LIKE concat('%', #{ggxh}, '%'))
             </if>
             <if test="purType != '' and purType != null">
                 AND basic_udirel.purType = #{purType}
@@ -279,6 +281,22 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                basic_products.nameCode LIKE concat('%', #{keyWords}, '%')
+                or basic_products.ybbm LIKE concat('%', #{keyWords}, '%')
+                or basic_products.sptm LIKE concat('%', #{keyWords}, '%')
+                or basic_products.bzgg LIKE concat('%', #{keyWords}, '%')
+                or basic_products.prepnSpec LIKE concat('%', #{keyWords}, '%')
+                or basic_products.cpmctymc LIKE concat('%', #{keyWords}, '%')
+                or basic_products.ggxh LIKE concat('%', #{keyWords}, '%')
+                or basic_products.manufactory LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId1 LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId2 LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId3 LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         ORDER BY company_product_relevance.updateTime DESC
     </select>

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

@@ -154,7 +154,7 @@
     <select id="selectPurApplyDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
         SELECT pur_apply_detail.*,
                pur_apply.billNo,
-               basic_products.ggxh spec,
+               COALESCE(basic_products.ggxh,basic_products.bzgg) AS spec,
                basic_products.nameCode,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,
@@ -185,7 +185,10 @@
                 AND productName like concat('%', #{productName}, '%')
             </if>
             <if test="spec != null and spec != ''">
-                AND basic_products.ggxh like concat('%', #{spec}, '%')
+                AND (
+                basic_products.ggxh like concat('%', #{spec}, '%')
+                or basic_products.bzgg like concat('%', #{spec}, '%')
+                )
             </if>
             <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
                 AND pur_apply_detail.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
@@ -203,6 +206,15 @@
                 and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') <= #{endDate}
                 ]]>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                basic_products.nameCode like concat('%', #{keyWords}, '%')
+                or productName like concat('%', #{keyWords}, '%')
+                or basic_products.ggxh like concat('%', #{keyWords}, '%')
+                or basic_products.bzgg LIKE concat('%', #{keyWords}, '%')
+                or basic_products.manufactory like concat('%', #{keyWords}, '%')
+                or pur_apply_detail.zczbhhzbapzbh like concat('%', #{keyWords}, '%'))
+            </if>
             and  (pur_apply.status = 3 or saf.status = 3)
         </where>
         GROUP BY  basic_products.uuid

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

@@ -206,7 +206,10 @@
                 AND productName like concat('%', #{productName}, '%')
             </if>
             <if test="spec != null and spec != ''">
-                AND basic_products.ggxh like concat('%', #{spec}, '%')
+                AND (
+                basic_products.ggxh like concat('%', #{spec}, '%')
+                or basic_products.bzgg like concat('%', #{spec}, '%')
+                )
             </if>
             <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
                 AND pur_order_detail.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
@@ -224,6 +227,16 @@
                 and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
                 ]]>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                basic_products.nameCode like concat('%', #{keyWords}, '%')
+                or pur_order.billNo like concat('%', #{keyWords}, '%')
+                or productName like concat('%', #{keyWords}, '%')
+                or basic_products.ggxh like concat('%', #{keyWords}, '%')
+                or basic_products.bzgg LIKE concat('%', #{keyWords}, '%')
+                or basic_products.manufactory LIKE concat('%', #{keyWords}, '%')
+                or pur_order_detail.zczbhhzbapzbh like concat('%', #{keyWords}, '%'))
+            </if>
             and (pur_order.status = 3 or saf.status = 3)
         </where>
     </select>