凯和修改

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWhgenleg.java

@@ -231,10 +231,20 @@ public class TWhgenleg extends BaseEntity {
     private Long isCntrno;
     /** 是否按照提单号 */
     private Long isMblno;
+    //手机号
+    private String fTel;
 
     private String timeStartBsdate;
     private String timeEndBsdate;
 
+    public String getfTel() {
+        return fTel;
+    }
+
+    public void setfTel(String fTel) {
+        this.fTel = fTel;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -570,6 +570,7 @@
 
     <select id="selectInventoryMapList" parameterType="TWhgenleg" resultType="Map">
         select
+        DISTINCT
             leg.f_id AS fId,
             leg.f_corpid AS fCorpIds,
             corp.f_name AS fCorpid,
@@ -609,6 +610,7 @@
             left join sys_user u on leg.create_by = u.user_name
             left join sys_dept d on u.dept_id = d.dept_id
             LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
+            LEFT JOIN t_customer_contact tc ON tc.f_pid = corp.f_id
             LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
             LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid
             LEFT JOIN sys_dict_data dict ON dict.dict_value = leg.f_business_type
@@ -621,6 +623,7 @@
             AND dict.dict_type = 'storage_type'
             AND dict1.dict_type = 'data_trademodes'
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
+            <if test="fTel != null  and fTel != ''">and tc.f_tel = #{fTel}</if>
             <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
             <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
             <if test="fMblno != null ">and leg.f_mblno LIKE  concat('%', #{fMblno}, '%') </if>