2024年4月25日09:25:43

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

@@ -314,12 +314,23 @@ public class TWhgenleg extends BaseEntity {
     @TableField(exist = false)
     private String fNo;
 
+    @TableField(exist = false)
+    private String goodsName;
+
 
     /**
      *核注清单
      */
     private String checklists;
 
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
     public String getfWarehouseInformation() {
         return fWarehouseInformation;
     }

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

@@ -777,7 +777,7 @@
             AND leg.f_qtyblc > 0
             AND leg.f_grossweightblc > 0
             AND leg.f_netweightblc > 0
-            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
+            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno  like concat('%', #{fOriginalbillno}, '%')</if>
             <if test="lockStatus == null or lockStatus == ''">and leg.lock_status != 1</if>
             <if test="warehouseInformation != null  and warehouseInformation != ''">and ware.f_warehouse_information = #{warehouseInformation}</if>
             <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
@@ -808,8 +808,9 @@
             <if test="fNetweightblc != null ">and leg.f_netweightblc = #{fNetweightblc}</if>
             <if test="fCntrno != null  and fCntrno != ''">and leg.f_cntrno LIKE  concat('%', #{fCntrno}, '%')</if>
             <if test="fLocalcntrno != null  and fLocalcntrno != ''">and leg.f_localcntrno LIKE  concat('%', #{fLocalcntrno}, '%')</if>
-            <if test="fNo != null  and fLocalcntrno != ''">and goods.f_no LIKE  concat('%', #{fNo}, '%')</if>
-            <if test="fMblno != null ">and leg.f_mblno = #{fMblno} </if>
+            <if test="fNo != null  and fNo != ''">and goods.f_no LIKE  concat('%', #{fNo}, '%')</if>
+            <if test="goodsName != null  and goodsName != ''">and goods.f_name LIKE  concat('%', #{goodsName}, '%')</if>
+            <if test="fMblno != null and fMblno != ''">and leg.f_mblno = #{fMblno} </if>
             <if test="fStatus != null  and fStatus != ''">and leg.f_status = #{fStatus}</if>
 
             <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid} </if>
@@ -890,8 +891,6 @@
             and leg.del_flag = '0'
             <if test="isMblno != null and isMblno == 0 ">
                 AND leg.f_qtyblc != 0
-                AND leg.f_grossweightblc != 0
-                AND leg.f_netweightblc != 0
             </if>
             AND dict.dict_type = 'storage_type'
             AND dict1.dict_type = 'data_trademodes'
@@ -938,7 +937,6 @@
         ${params.dataScope}
         order by leg.f_bsdate desc
     </select>
-
     <select id="selectInventoryMapListV2" parameterType="TWhgenleg" resultType="Map">
         select
         DISTINCT