现金流量表服务增加物流支出费用

Bailun.DC.DailyPayAndIncoming/Program.cs

@@ -22,13 +22,12 @@ namespace Bailun.DC.DailyPayAndIncoming
         //{
         //    var _services = new Services();
 
-        //    var start = DateTime.Parse("2019-11-08");
+        //    var start = DateTime.Parse("2019-11-01");
         //    while (start < DateTime.Now)
         //    {
-
+        //        Console.WriteLine(start);
         //        _services.Init(start, start.AddDays(1));
         //        _services.SaveMoneyFlowCount(start, start.AddDays(1));
-        //        Console.WriteLine(start);
         //        start = start.AddDays(1);
         //    }
         //}

Bailun.DC.DailyPayAndIncoming/Services.cs

@@ -59,14 +59,19 @@ namespace Bailun.DC.DailyPayAndIncoming
             //管理成本  广州百伦、香港百伦、电子服装厂、阳山仓、深圳仓的管理成本
             var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
+            var lgurl = "http://api.fee.bailuntec.com/purchase/other/cost/api/logisticsCostList?";
 
             url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
             cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.AddDays(-1).ToString("yyyy-MM-dd");
-            
+            lgurl += "startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
+        
             //利息支出
             var listInterest = ListInterestExpense(cwurl);
             //管理成品
             var list = ListOtherCost(url);
+            //物流费支出
+            var listlg = ListLogisticFee(url);
+
 
             decimal costTotal = 0;
             costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB):0;
@@ -78,6 +83,12 @@ namespace Bailun.DC.DailyPayAndIncoming
                 costTotal += list.Sum(a => a.amountRmb);
             }
 
+            //支出 物流费支出
+            if (listlg.Count() > 0)
+            {
+                costTotal += listlg.Sum(a => a.amountRmb);
+            }
+
 
             //支出 2、成品采购+半成品采购+百伦（广州、香港）支付给哈倪曼和拉古娜的费用+百伦管理费用
             var sql = $@"select sum(cashier_paymoneyrmb) as amount from dc_base_finance_cashier where cashier_status=1 and cashier_type=1 and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'  and ((sourcecode in ('Buy','SemiFinishedProduct') and companymain_value_from !=14 and companymain_value_from!=48) or (tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','广州美甲生产仓') and companymain_value_from in (1,2,5,7,8) and sourcecode in ('newCost','IncomeAndExpenditure')))";
@@ -121,14 +132,18 @@ namespace Bailun.DC.DailyPayAndIncoming
             //管理成本  广州百伦、香港百伦、电子服装厂、阳山仓、深圳仓的管理成本
             var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
+            var lgurl = "http://api.fee.bailuntec.com/purchase/other/cost/api/logisticsCostList?";
 
             url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
             cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.AddDays(-1).ToString("yyyy-MM-dd");
+            lgurl += "startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
 
             //利息支出
             var listInterest = ListInterestExpense(cwurl);
             //管理成品
             var list = ListOtherCost(url);
+            //物流费支出
+            var listlg = ListLogisticFee(url);
 
             decimal costTotal = 0;
             costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB) : 0;
@@ -138,6 +153,11 @@ namespace Bailun.DC.DailyPayAndIncoming
                 costTotal += list.Sum(a => a.amountRmb);
             }
 
+            //支出 物流费支出
+            if (listlg.Count() > 0)
+            {
+                costTotal += listlg.Sum(a => a.amountRmb);
+            }
 
             //采购下单
             var sql = $"select sum(amount_paid) amount from dc_base_purchase_details where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and `status`>=0";
@@ -259,6 +279,26 @@ namespace Bailun.DC.DailyPayAndIncoming
             return list;
         }
 
+        /// <summary>
+        /// 获取物流费列表
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public List<Models.Api.mLogisticFee> ListLogisticFee(string url)
+        {
+            var list = new List<Models.Api.mLogisticFee>();
+            var result = Common.HttpHelper.NetHelper.Request(url);
+            if (!string.IsNullOrEmpty(result))
+            {
+                var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<Models.Api.ListLogisticFee>(result);
+                if (obj != null)
+                {
+                    list = obj.data;
+                }
+            }
+
+            return list;
+        }
 
         #endregion
     }

Bailun.DC.Models/Api/mLogisticFee.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models.Api
+{
+    /// <summary>
+    /// 物流费
+    /// </summary>
+    public class mLogisticFee
+    {
+        public string no { get; set; }
+
+        /// <summary>
+        /// 被出纳公司名
+        /// </summary>
+        public string receiveUnit { get; set; }
+
+        /// <summary>
+        /// 原因
+        /// </summary>
+        public string reason { get; set; }
+
+        /// <summary>
+        /// 出纳时间
+        /// </summary>
+        public DateTime payTime { get; set; }
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public int manageCostType { get; set; }
+
+        /// <summary>
+        /// 部门
+        /// </summary>
+        public string departmentName { get; set; }
+
+        /// <summary>
+        /// 付款主体id
+        /// </summary>
+        public int companyValue { get; set; }
+
+        /// <summary>
+        /// 付款主体名称
+        /// </summary>
+        public string companyName { get; set; }
+
+        /// <summary>
+        /// 费用主类型
+        /// </summary>
+        public string feeSuperType { get; set; }
+
+        /// <summary>
+        /// 费用子类型
+        /// </summary>
+        public string feeSubType { get; set; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal amount { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string currency { get; set; }
+
+        /// <summary>
+        /// 人民币金额
+        /// </summary>
+        public decimal amountRmb { get; set; }
+    }
+
+    public class ListLogisticFee
+    {
+        public List<mLogisticFee> data { get; set; }
+    }
+}