出入库统计仓库检索

ruoyi-warehouse/src/main/java/com/ruoyi/anpin/WarhousrExcel.java

@@ -24,6 +24,9 @@ public class WarhousrExcel {
     @Excel(name = "项目名称")
     private String projectName;
 
+    @Excel(name = "仓库")
+    private String wareHouseName;
+
     /**
      *    fid
      */
@@ -75,6 +78,13 @@ public class WarhousrExcel {
     //开票公司ID
     private Long fSbu;
 
+    public String getWareHouseName() {
+        return wareHouseName;
+    }
+
+    public void setWareHouseName(String wareHouseName) {
+        this.wareHouseName = wareHouseName;
+    }
     public BigDecimal getfUnitprice() {
         return fUnitprice;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehousebillsfees.java

@@ -61,6 +61,12 @@ public class TWarehousebillsfees extends BaseEntity {
     private BigDecimal fQty;
 
     /**
+     * 仓库名称
+     */
+    @Excel(name = "仓库名称")
+    private String wareHouseName;
+
+    /**
      * 单价
      */
     @Excel(name = "单价")
@@ -372,6 +378,14 @@ public class TWarehousebillsfees extends BaseEntity {
      */
     private BigDecimal fNetweightblc;
 
+    public String getWareHouseName() {
+        return wareHouseName;
+    }
+
+    public void setWareHouseName(String wareHouseName) {
+        this.wareHouseName = wareHouseName;
+    }
+
     public BigDecimal getfGrossweightblc() {
         return fGrossweightblc;
     }

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

@@ -1018,6 +1018,7 @@
             resultType="com.ruoyi.anpin.WarhousrExcel">
         SELECT
         tw.f_id AS fId,
+        th.f_warehouse_information as wareHouseName,/*仓库*/
         ti.f_bsdate AS fBsdate,/*进货时间*/
         tf.f_name AS feeName,/*物资名称*/
         tf.f_currency AS fCurrencyName,/*物资规格*/
@@ -1078,6 +1079,7 @@
             <if test="fBilltype == null  or fBilltype == ''">and tw.f_billtype in ('CK','RK')</if>
             <if test="fFeeid != null ">and tw.f_feeid = #{fFeeid}</if>
             <if test="fFeeType != null ">and tf.f_feetype = #{fFeeType}</if>
+            <if test="fWarehouseid != null ">and ti.f_warehouseid = #{fWarehouseid}</if>
             <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
                 and ti.f_bsdate &gt;= #{cLoadDate[0]}
             </if>
@@ -1982,6 +1984,7 @@
     <select id="selectTWarehouseFold" parameterType="TWarehousebillsfees"
             resultType="com.ruoyi.anpin.WarhousrExcel">
         SELECT tw.f_id AS fId,
+        th.f_warehouse_information as wareHouseName,/*仓库*/
         ti.f_bsdate AS fBsdate,/*进货时间*/
         tf.f_name AS feeName,/*物资名称*/
         tf.f_currency AS fCurrencyName,/*物资规格*/
@@ -2041,6 +2044,7 @@
             <if test="fGoodsid != null ">and ti.f_goodsid = #{fGoodsid}</if>
             <if test="fFeeid != null ">and tw.f_feeid = #{fFeeid}</if>
             <if test="fFeeType != null ">and tf.f_feetype = #{fFeeType}</if>
+            <if test="fWarehouseid != null ">and ti.f_warehouseid = #{fWarehouseid}</if>
             <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
                 and ti.f_bsdate &gt;= #{cLoadDate[0]}
             </if>
@@ -2054,6 +2058,7 @@
     <select id="selectTWarehouseCallout" parameterType="TWarehousebillsfees"
             resultType="com.ruoyi.anpin.WarhousrExcel">
         SELECT tw.f_id AS fId,
+        th.f_warehouse_information as wareHouseName,/*仓库*/
         ti.f_bsdate AS fBsdate,/*进货时间*/
         tf.f_name AS feeName,/*物资名称*/
         tf.f_currency AS fCurrencyName,/*物资规格*/
@@ -2113,6 +2118,7 @@
             <if test="fGoodsid != null ">and ti.f_goodsid = #{fGoodsid}</if>
             <if test="fFeeid != null ">and tw.f_feeid = #{fFeeid}</if>
             <if test="fFeeType != null ">and tf.f_feetype = #{fFeeType}</if>
+            <if test="fWarehouseid != null ">and ti.f_warehouseid = #{fWarehouseid}</if>
             <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
                 and ti.f_bsdate &gt;= #{cLoadDate[0]}
             </if>