出入库统计导出加开票公司，货物类别

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

@@ -23,8 +23,12 @@ public class WarhousrExcel {
     private Date fBsdate;
     @Excel(name = "项目名称")
     private String projectName;
+    @Excel(name = "开票公司")
+    private String fSbuName;
     @Excel(name = "出入库类别")
     private String fBilltypeName;
+    @Excel(name = "货物类别")
+    private String fFeetype;
     @Excel(name = "产品名称")
     private String feeName;
     @Excel(name = "规格")
@@ -58,8 +62,24 @@ public class WarhousrExcel {
     private String number;
     @Excel(name = "验收人")
     private String checkName;
-    //物资类别中文名
-    private String fFeetype;
+    //开票公司ID
+    private Long fSbu;
+
+    public String getfSbuName() {
+        return fSbuName;
+    }
+
+    public void setfSbuName(String fSbuName) {
+        this.fSbuName = fSbuName;
+    }
+
+    public Long getfSbu() {
+        return fSbu;
+    }
+
+    public void setfSbu(Long fSbu) {
+        this.fSbu = fSbu;
+    }
 
     public BigDecimal getfAmount() {
         return fAmount;

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

@@ -522,11 +522,11 @@
                 f_stlamount_date =#{map.tFee.fAccbilldate}
             </if>
             /*判断开发票款*/
-            <if test="map.billType == 'invoiceFP'">
+            <if test="map.billType == 'invoiceFP' or map.billType == 'XXFP' or map.billType == 'JXFP'">
                 f_invamount = f_invamount + #{map.tFeeDo.fAmt},
                 f_stlamount_date =#{map.tFee.fAccbilldate}
             </if>
-            <if test="map.billType == 'DZinvoiceFP'">
+            <if test="map.billType == 'DZinvoiceFP' or map.billType == 'DZXXFP' or map.billType == 'DZJXFP'">
                 f_invamount = f_invamount - #{map.tFeeDo.fAmt},
                 f_stlamount_date =#{map.tFee.fAccbilldate}
             </if>
@@ -1026,7 +1026,9 @@
         '出库'
         WHEN tw.f_billtype = 'RK' THEN
         '入库'
-        END AS fBilltypeName/*出入库类型*/
+        END AS fBilltypeName,/*出入库类型*/
+        ti.f_sbu AS fSbu,/*开票公司ID*/
+        ts.f_name AS fSbuName/*开票公司名称*/
         FROM t_warehousebillsfees tw
         LEFT JOIN t_fees tf ON tw.f_feeid = tf.f_id
         LEFT JOIN t_warehouse th ON tw.f_warehouseid = th.f_id
@@ -1043,6 +1045,7 @@
         LEFT JOIN t_warehousebills ti ON tw.f_pid = ti.f_id
         LEFT JOIN t_project tp ON ti.f_goodsid = tp.f_id
         LEFT JOIN t_corps tc ON ti.f_corpid = tc.f_id
+        LEFT JOIN t_corps ts ON ti.f_sbu = ts.f_id
         LEFT JOIN sys_user sr ON sr.user_id = ti.f_purchase
         LEFT JOIN sys_dict_data std ON std.dict_value = tf.f_feetype
         AND std.dict_type = 'data_cost_attribute'