新增30天现金流入，30天现金流出

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -1789,7 +1789,8 @@ from dc_report_cash_flow_log as t1 left join dc_base_warehouse as t2 on t1.wareh
                 search.data_type = 1;
             }
             var sql = @" select t1.*,t2.sku_title_cn as 'sku_name',t2.`status` as 'sku_status',t2.buyer_name,ifnull(t3.warehouse_name,t3.warehouse_extend_name) as  'warehouse_name',ifnull(t4.usable_stock,0) as 'usable_stock',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way',
-(ifnull(t4.usable_stock,0) * t2.unit_price) as 'stock_amount',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',ifnull(t8.history_sevenday_sales,0) as 'history_sevenday_sales',ifnull(t8.history_fourteenday_sales,0) as 'history_fourteenday_sales',ifnull(t8.history_thirtyday_sales,0) as 'history_thirtyday_sales'
+(ifnull(t4.usable_stock,0) * t2.unit_price) as 'stock_amount',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',ifnull(t8.history_sevenday_sales,0) as 'history_sevenday_sales',ifnull(t8.history_fourteenday_sales,0) as 'history_fourteenday_sales',ifnull(t8.history_thirtyday_sales,0) as 'history_thirtyday_sales',
+(0-ifnull(t4.pay_amount_30,0)) as 'pay_amount_30',ifnull(t4.income_amount_30,0) as 'income_amount_30'
 from dc_report_cash_flow_sku_group as t1 
 left join dc_base_sku as t2 on t1.bailun_sku=t2.bailun_sku 
 left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code
@@ -1812,7 +1813,9 @@ sum(t1.last_expend) as 'last_expend',
 sum(ifnull(t4.usable_stock,0)) as 'usable_stock',
 sum(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way',
 sum(ifnull(t4.usable_stock,0) * t2.unit_price) as 'stock_amount',
-sum(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount'
+sum(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',
+sum(0-ifnull(t4.pay_amount_30,0)) as 'pay_amount_30',
+sum(ifnull(t4.income_amount_30,0)) as 'income_amount_30'
 
 from dc_report_cash_flow_sku_group as t1 
 left join dc_base_sku as t2 on t1.bailun_sku=t2.bailun_sku 

AutoTurnOver.Models/dc_report_cash_flow_log.cs

@@ -301,6 +301,8 @@ namespace AutoTurnOver.Models
     }
     public class dc_report_cash_flow_sku_group_dto : dc_report_cash_flow_sku_group
     {
+        public decimal pay_amount_30 { get; set; }
+        public decimal income_amount_30 { get; set; }
         public string sku_name { get; set; }
         public int sku_status { get; set; }
         public string buyer_name { get; set; }