调整月销售利润报表，增加gg收入区分

Bailun.DC.Models/dc_month_sales_profit.cs

@@ -214,6 +214,11 @@ namespace Bailun.DC.Models
         public decimal incoming_refundtax { get; set; }
 
         /// <summary>
+        /// 加：歌戈尔收入
+        /// </summary>
+        public decimal incoming_gogirl { get; set; }
+
+        /// <summary>
         /// 加：营业外收入
         /// </summary>
         public decimal incoming_non_operating { get; set; }

Bailun.DC.MonthSaleProfit/Program.cs

@@ -22,7 +22,7 @@ namespace Bailun.DC.MonthSaleProfit
         //{
         //    var _services = new Services();
 
-        //    var start = DateTime.Parse("2021-1-01");
+        //    var start = DateTime.Parse("2021-3-01");
         //    //_services.Init(start);
         //    _services.InitNew(start);
         //    //_services.InitNew4K(start);

Bailun.DC.MonthSaleProfit/Services.cs

@@ -508,6 +508,7 @@ namespace Bailun.DC.MonthSaleProfit
                 incoming_non_operating = 0,
                 incoming_other = 0,
                 incoming_refundtax = 0,
+                incoming_gogirl = 0,
                 isedit = 0,
                 lastupdatetime = DateTime.Now,
                 lastupdateuserid = 0,
@@ -673,6 +674,14 @@ 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.incoming_refundtax = list.Where(a => a.type_name == "出口退税款")?.Sum(a => -a.amount_rmb)??0;
+
+                //歌戈尔收入
+                m.incoming_gogirl = list.Where(a => a.company_name.Contains("歌戈儿") && a.type_name == "销售收入")?.Sum(a => -a.amount_rmb) ?? 0;
+
+                //其他收入=出口退税+歌戈尔收入
+                m.incoming_other = m.incoming_refundtax + m.incoming_gogirl;
 
                 //实际利润=营业利润+其他收入+营业外收入-营业外支出
                 m.actual_profit = m.profit + m.incoming_other + m.incoming_non_operating - m.pay_non_operating;
@@ -694,8 +703,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,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})";
+                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,incoming_gogirl) 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},{m.incoming_gogirl})";
 
                 cn.Execute(sql);
             }