待审数据模糊查询修正、完善仓储费明细导出

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -253,7 +253,9 @@
         <if test="billNo != null  and billNo != ''"> and item.bill_no = #{billNo}</if>
         <if test="actId != null  and actId != ''"> and item.act_id = #{actId}</if>
         <if test="refno2 != null  and refno2 != ''"> and item.refno2 = #{refno2}</if>
-        <if test="refno3 != null  and refno3 != ''"> and item.refno3 = #{refno3}</if>
+        <if test="refno3 != null  and refno3 != ''">
+            and item.refno3 like concat('%', #{refno3}, '%') or item.bill_no like concat('%', #{refno3}, '%')
+        </if>
         <if test="billId != null  and billId != ''"> and item.bill_id like concat('%', #{billId}, '%')</if>
         <if test="refno1 != null  and refno1 != ''"> and corp.f_name like concat('%', #{refno1}, '%')</if>
         <if test="sendUserId != null  and sendUserId != ''"> and item.send_user_id like concat('%', #{sendUserId}, '%')</if>
@@ -406,4 +408,4 @@
             order by a.id desc
     </select>
 
-</mapper>
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -682,7 +682,9 @@
         wf.f_mblno            AS fMblno,
         wf.f_product_name     AS fProductName,
         wi.f_packagespecs     AS fPackagespecs,
-        '库存'       AS fBusinessType,
+        '在库'                 AS fBusinessType,
+        wf.f_bsdate           AS inStockDate,
+        wf.f_amount           AS fAmount,
         wf.f_billing_qty      AS surplus
         FROM t_warehousebills w
         LEFT JOIN t_warehousebillsfees wf ON w.f_id = wf.f_pid