月销售利润报表增加海外仓杂费字段

Bailun.DC.Models/dc_month_sales_profit.cs

@@ -125,9 +125,15 @@ namespace Bailun.DC.Models
         public decimal fee_logistics_direct { get; set; }
 
         /// <summary>
-        /// 海外仓仓储及其他费用
+        /// 海外仓仓储
         /// </summary>
         public decimal fee_storage { get; set; }
+
+        /// <summary>
+        /// 海外仓其他杂费
+        /// </summary>
+        public decimal fee_storage_incidentals { get; set; }
+
         /// <summary>
         /// 付现销售费用
         /// </summary>

Bailun.DC.Models/mMonthSaleProfitNew_Input.cs

@@ -110,9 +110,15 @@ namespace Bailun.DC.Models
         public decimal? fee_logistics_tail { get; set; }
 
         /// <summary>
-        /// 海外仓仓储及其他费用
+        /// 海外仓仓储
         /// </summary>
         public decimal? fee_storage { get; set; }
+
+        /// <summary>
+        /// 海外仓其他杂费
+        /// </summary>
+        public decimal? fee_storage_incidentals { get; set; }
+
         /// <summary>
         /// 付现销售费用
         /// </summary>

Bailun.DC.MonthSaleProfit/Services.cs

@@ -29,7 +29,7 @@ namespace Bailun.DC.MonthSaleProfit
             {
                 var now = DateTime.Now;
 
-                if (now.Day == 1 && now.Hour == 0 && now.Minute == 1)  //每个月的1日0点1分启动
+                if (now.Day == 1 && now.Hour == 0 && now.Minute == 45 && now.Second==1)  //每个月的1日0点1分启动
                 {
                     Console.WriteLine("开始启动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     var start = DateTime.Parse(now.AddMonths(-1).ToShortDateString());

Bailun.DC.Services/FinanceReportServices.cs

@@ -5285,6 +5285,7 @@ group by currency";
                         fee_refund = 0,
                         fee_sales_count = 0,
                         fee_storage = 0,
+                        fee_storage_incidentals = 0,
 
 
                         cost_fuzhuang = 0,
@@ -5442,6 +5443,11 @@ group by currency";
                     obj.fee_storage = m.fee_storage.Value;
                 }
 
+                if(m.fee_storage_incidentals.HasValue)
+                {
+                    obj.fee_storage_incidentals = m.fee_storage_incidentals.Value;
+                }
+
                 if(m.incoming_non_operating.HasValue)
                 {
                     obj.incoming_non_operating = m.incoming_non_operating.Value;
@@ -5512,8 +5518,8 @@ group by currency";
                 obj.fee_platform_and_refund = obj.fee_platform + obj.fee_fba + obj.fee_refund;
                 sql_update += " ,fee_platform_and_refund=" + obj.fee_platform_and_refund;
 
-                //物流仓储费用 = 头程运输+直邮物流费+海外仓仓储及其他费用
-                obj.fee_logistics_storage = obj.fee_logistics_first + obj.fee_logistics_direct + obj.fee_storage;
+                //物流仓储费用 = 头程运输+直邮物流费+海外仓仓储+海外仓杂费
+                obj.fee_logistics_storage = obj.fee_logistics_first + obj.fee_logistics_direct + obj.fee_storage+ obj.fee_storage_incidentals;
                 sql_update += " ,fee_logistics_storage=" + obj.fee_logistics_storage;
 
                 //销售费用合计=平台扣费及退款+物流仓储费用+付现销售费用
@@ -5558,7 +5564,7 @@ group by currency";
 
                 sql_update += $" ,lastupdatetime='{obj.lastupdatetime.ToString("yyyy-MM-dd HH:mm:ss")}',lastupdateuserid={obj.lastupdateuserid},lastupdateusername='{obj.lastupdateusername}'";
 
-                sql_update += " where id="+obj.id;
+                //sql_update += " where id="+obj.id;
                 #endregion
 
                 if (obj.id>0)

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

@@ -8607,6 +8607,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     fee_refund = a.fee_refund.ToString("N2"),
                     fee_sales_count = a.fee_sales_count.ToString("N2"),
                     fee_storage = a.fee_storage.ToString("N2"),
+                    fee_storage_incidentals = a.fee_storage_incidentals.ToString("N2"),
 
                     incoming_non_operating = a.incoming_non_operating.ToString("N2"),
                     incoming_other = a.incoming_other.ToString("N2"),
@@ -8667,6 +8668,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listHead.Add(new Tuple<string, string, int>("直邮物流费", "fee_logistics_direct", 0));
                 listHead.Add(new Tuple<string, string, int>("尾程物流费", "fee_logistics_tail", 0));
                 listHead.Add(new Tuple<string, string, int>("海外仓仓储费", "fee_storage", 0));
+                listHead.Add(new Tuple<string, string, int>("海外仓其他杂费", "fee_storage_incidentals", 0)); 
                 listHead.Add(new Tuple<string, string, int>("付现销售费用", "fee_paycash_sales", 0));
 
 
@@ -8735,6 +8737,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     m.fee_refund = item.Sum(a => a.fee_refund);
                     m.fee_sales_count = item.Sum(a => a.fee_sales_count);
                     m.fee_storage = item.Sum(a => a.fee_storage);
+                    m.fee_storage_incidentals = item.Sum(a => a.fee_storage_incidentals);
 
                     m.incoming_non_operating = item.Sum(a => a.incoming_non_operating);
                     m.incoming_other = item.Sum(a => a.incoming_other);
@@ -8761,8 +8764,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     //平台费用
                     m.fee_platform_and_refund = m.fee_platform + m.fee_fba + m.fee_ad;
 
-                    //物流仓储费用 = 头程运输+直邮物流费+尾程费+海外仓仓储及其他费用
-                    m.fee_logistics_storage = m.fee_logistics_first + m.fee_logistics_direct+m.fee_logistics_tail + m.fee_storage;
+                    //物流仓储费用 = 头程运输+直邮物流费+尾程费+海外仓仓储+海外仓其他杂费
+                    m.fee_logistics_storage = m.fee_logistics_first + m.fee_logistics_direct+m.fee_logistics_tail + m.fee_storage+m.fee_storage_incidentals;
 
                     //销售费用合计=平台扣费及退款+物流仓储费用+付现销售费用
                     m.fee_sales_count = m.fee_platform_and_refund + m.fee_logistics_storage + m.fee_paycash_sales;
@@ -8827,6 +8830,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     fee_refund = a.fee_refund.ToString("N2"),
                     fee_sales_count = a.fee_sales_count.ToString("N2"),
                     fee_storage = a.fee_storage.ToString("N2"),
+                    fee_storage_incidentals = a.fee_storage_incidentals.ToString("N2"),
 
                     incoming_non_operating = a.incoming_non_operating.ToString("N2"),
                     incoming_other = a.incoming_other.ToString("N2"),