增加出口退税收入字段

Bailun.DC.Models/dc_month_sales_profit.cs

@@ -207,6 +207,12 @@ namespace Bailun.DC.Models
         /// 加：其他收入
         /// </summary>
         public decimal incoming_other { get; set; }
+
+        /// <summary>
+        /// 加：出口退税收入
+        /// </summary>
+        public decimal incoming_refundtax { get; set; }
+
         /// <summary>
         /// 加：营业外收入
         /// </summary>

Bailun.DC.Models/mMonthSaleProfitNew_Input.cs

@@ -199,6 +199,11 @@ namespace Bailun.DC.Models
         /// </summary>
         public decimal? incoming_other { get; set; }
         /// <summary>
+        /// 其中：出口退税收入
+        /// </summary>
+        public decimal? incoming_refundtax { get; set; }
+
+        /// <summary>
         /// 加：营业外收入
         /// </summary>
         public decimal? incoming_non_operating { get; set; }

Bailun.DC.MonthSaleProfit/Services.cs

@@ -507,6 +507,7 @@ namespace Bailun.DC.MonthSaleProfit
                 dividend = 0,
                 incoming_non_operating = 0,
                 incoming_other = 0,
+                incoming_refundtax = 0,
                 isedit = 0,
                 lastupdatetime = DateTime.Now,
                 lastupdateuserid = 0,
@@ -676,6 +677,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
                 //营业毛利率=营业利润/销售额
                 m.rate_profit = m.amount_sales > 0 ? m.profit / m.amount_sales : 0;
 
+
                 //实际利润=营业利润+其他收入+营业外收入-营业外支出
                 m.actual_profit = m.profit + m.incoming_other + m.incoming_non_operating - m.pay_non_operating;
 
@@ -696,8 +698,8 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
                 }
 
                 cn.Execute("delete from dc_month_sales_profit where isedit=0 and month='" + m.month + "'");
-                sql = $@"insert dc_month_sales_profit (month,amount_sales,amount_sales_jingyou,amount_sales_dianzi,amount_sales_jiaju,amount_sales_meirongmj,amount_sales_fuzhuang,amount_sales_other,cost,cost_jingyou,cost_dianzi,cost_jiaju,cost_meirongmj,cost_fuzhuang,cost_other,fee_platform_and_refund,fee_platform,fee_fba,fee_refund,amount_withdraw,fee_logistics_storage,fee_logistics_first,fee_logistics_direct,fee_logistics_tail,fee_storage,fee_paycash_sales,fee_sales_count,profit_sales,rate_profit_sales,managecost_bl_xg,managecost_bl_gz,managecost_meijia,managercost_yangshan,managercost_chengpincang,managercost_xinhuilan,managercost_count,fee_finance,profit,rate_profit,incoming_other,incoming_non_operating,pay_non_operating,actual_profit,dividend,profit_balance,rate_profit_actual,createtime,lastupdateuserid,lastupdateusername,lastupdatetime,isedit,managercost_dizhi,managercost_meijiashengchan,fee_ad,fee_storage_incidentals) values 
-                        ('{m.month}',{m.amount_sales},{m.amount_sales_jingyou},{m.amount_sales_dianzi},{m.amount_sales_jiaju},{m.amount_sales_meirongmj},{m.amount_sales_fuzhuang},{m.amount_sales_other},{m.cost},{m.cost_jingyou},{m.cost_dianzi},{m.cost_jiaju},{m.cost_meirongmj},{m.cost_fuzhuang},{m.cost_other},{m.fee_platform_and_refund},{m.fee_platform},{m.fee_fba},{m.fee_refund},{m.amount_withdraw},{m.fee_logistics_storage},{m.fee_logistics_first},{m.fee_logistics_direct},{m.fee_logistics_tail},{m.fee_storage},{m.fee_paycash_sales},{m.fee_sales_count},{m.profit_sales},{m.rate_profit_sales},{m.managecost_bl_xg},{m.managecost_bl_gz},{m.managecost_meijia},{m.managercost_yangshan},{m.managercost_chengpincang},{m.managercost_xinhuilan},{m.managercost_count},{m.fee_finance},{m.profit},{m.rate_profit},{m.incoming_other},{m.incoming_non_operating},{m.pay_non_operating},{m.actual_profit},{m.dividend},{m.profit_balance},{m.rate_profit_actual},'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',{m.lastupdateuserid},'{m.lastupdateusername}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',0,{m.managercost_dizhi},{m.managercost_meijiashengchan},{m.fee_ad},{m.fee_storage_incidentals})";
+                sql = $@"insert dc_month_sales_profit (month,amount_sales,amount_sales_jingyou,amount_sales_dianzi,amount_sales_jiaju,amount_sales_meirongmj,amount_sales_fuzhuang,amount_sales_other,cost,cost_jingyou,cost_dianzi,cost_jiaju,cost_meirongmj,cost_fuzhuang,cost_other,fee_platform_and_refund,fee_platform,fee_fba,fee_refund,amount_withdraw,fee_logistics_storage,fee_logistics_first,fee_logistics_direct,fee_logistics_tail,fee_storage,fee_paycash_sales,fee_sales_count,profit_sales,rate_profit_sales,managecost_bl_xg,managecost_bl_gz,managecost_meijia,managercost_yangshan,managercost_chengpincang,managercost_xinhuilan,managercost_count,fee_finance,profit,rate_profit,incoming_other,incoming_non_operating,pay_non_operating,actual_profit,dividend,profit_balance,rate_profit_actual,createtime,lastupdateuserid,lastupdateusername,lastupdatetime,isedit,managercost_dizhi,managercost_meijiashengchan,fee_ad,fee_storage_incidentals,incoming_refundtax) values 
+                        ('{m.month}',{m.amount_sales},{m.amount_sales_jingyou},{m.amount_sales_dianzi},{m.amount_sales_jiaju},{m.amount_sales_meirongmj},{m.amount_sales_fuzhuang},{m.amount_sales_other},{m.cost},{m.cost_jingyou},{m.cost_dianzi},{m.cost_jiaju},{m.cost_meirongmj},{m.cost_fuzhuang},{m.cost_other},{m.fee_platform_and_refund},{m.fee_platform},{m.fee_fba},{m.fee_refund},{m.amount_withdraw},{m.fee_logistics_storage},{m.fee_logistics_first},{m.fee_logistics_direct},{m.fee_logistics_tail},{m.fee_storage},{m.fee_paycash_sales},{m.fee_sales_count},{m.profit_sales},{m.rate_profit_sales},{m.managecost_bl_xg},{m.managecost_bl_gz},{m.managecost_meijia},{m.managercost_yangshan},{m.managercost_chengpincang},{m.managercost_xinhuilan},{m.managercost_count},{m.fee_finance},{m.profit},{m.rate_profit},{m.incoming_other},{m.incoming_non_operating},{m.pay_non_operating},{m.actual_profit},{m.dividend},{m.profit_balance},{m.rate_profit_actual},'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',{m.lastupdateuserid},'{m.lastupdateusername}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',0,{m.managercost_dizhi},{m.managercost_meijiashengchan},{m.fee_ad},{m.fee_storage_incidentals},{m.incoming_refundtax})";
 
                 cn.Execute(sql);
             }

Bailun.DC.Services/FinanceReportServices.cs

@@ -5309,6 +5309,7 @@ group by currency";
                         dividend = 0,
                         incoming_non_operating = 0,
                         incoming_other = 0,
+                        incoming_refundtax = 0,
                         isedit = 1,
                         lastupdatetime = DateTime.Now,
                         lastupdateuserid = uid,
@@ -5464,6 +5465,11 @@ group by currency";
                     obj.incoming_other = m.incoming_other.Value;
                 }
 
+                if(m.incoming_refundtax.HasValue)
+                {
+                    obj.incoming_refundtax = m.incoming_refundtax.Value;
+                }
+
                 if(m.managecost_bl_gz.HasValue)
                 {
                     obj.managecost_bl_gz = m.managecost_bl_gz.Value;

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -8611,6 +8611,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                     incoming_non_operating = a.incoming_non_operating.ToString("N2"),
                     incoming_other = a.incoming_other.ToString("N2"),
+                    incoming_refundtax = a.incoming_refundtax.ToString("N2"),
                     a.isedit,
 
                     managecost_bl_gz = a.managecost_bl_gz.ToString("N2"),
@@ -8692,6 +8693,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listHead.Add(new Tuple<string, string, int>("营业利润", "profit", 1));
                 listHead.Add(new Tuple<string, string, int>("营业毛利率", "rate_profit", 0));
                 listHead.Add(new Tuple<string, string, int>("加：其他收入", "incoming_other", 0));
+                listHead.Add(new Tuple<string, string, int>("其中：出口退税收入", "incoming_refundtax", 0));
                 listHead.Add(new Tuple<string, string, int>("加：营业外收入", "incoming_non_operating", 0));
                 listHead.Add(new Tuple<string, string, int>("减：营业外支出", "pay_non_operating", 0));
                 listHead.Add(new Tuple<string, string, int>("实际利润", "actual_profit", 0));
@@ -8741,6 +8743,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                     m.incoming_non_operating = item.Sum(a => a.incoming_non_operating);
                     m.incoming_other = item.Sum(a => a.incoming_other);
+                    m.incoming_refundtax = item.Sum(a => a.incoming_refundtax);
                     m.isedit = 2; //合并的
                     m.managecost_bl_gz = item.Sum(a => a.managecost_bl_gz);
                     m.managecost_bl_xg = item.Sum(a => a.managecost_bl_xg);
@@ -8834,6 +8837,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                     incoming_non_operating = a.incoming_non_operating.ToString("N2"),
                     incoming_other = a.incoming_other.ToString("N2"),
+                    incoming_refundtax = a.incoming_refundtax.ToString("N2"),
                     a.isedit,
 
                     managecost_bl_gz = a.managecost_bl_gz.ToString("N2"),