调整Ebay销售站点的站点列表只取在报表上显示的站点，数据仓增加耗材仓数据

Bailun.DC.Models/Api/mOtherFee.cs

@@ -24,6 +24,11 @@ namespace Bailun.DC.Models.Api
         /// <summary>
         /// 付款主体名称
         /// </summary>
+        public int companyValue { get; set; }
+
+        /// <summary>
+        /// 付款主体名称
+        /// </summary>
         public string companyName { get; set; }
 
         /// <summary>
@@ -51,6 +56,22 @@ namespace Bailun.DC.Models.Api
         /// </summary>
         public decimal amountRmb { get; set; }
 
+        /// <summary>
+        /// 收款单位
+        /// </summary>
+        public string receiveUnit { get; set; }
+
+        /// <summary>
+        /// 付款理由
+        /// </summary>
+        public string reason { get; set; }
+
+        /// <summary>
+        /// 付款时间
+        /// </summary>
+        public DateTime? payTime { get; set; }
+
+
     }
 
     public class mListOtherFee

Bailun.DC.Services/CommonServices.cs

@@ -96,7 +96,7 @@ namespace Bailun.DC.Services
         /// </summary>
         /// <param name="platform">平台编码</param>
         /// <returns></returns>
-        public static List<string> ListWebSite(string platform)
+        public static List<string> ListWebSite(string platform,DateTime? start,DateTime? end)
         {
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
@@ -106,13 +106,23 @@ namespace Bailun.DC.Services
                 }
 
                 var sqlparam = new DynamicParameters();
-                var sql = "select website from dc_base_oms_order";
+                var sql = "select website from dc_base_oms_order where 1=1 ";
                 if (!string.IsNullOrWhiteSpace(platform))
                 {
-                    sql += " where platform_type=@platform_type";
+                    sql += " and platform_type=@platform_type";
                     sqlparam.Add("platform_type", platform);
                 }
 
+                if (start.HasValue)
+                {
+                    sql += " and paid_time>='"+start.Value.ToString("yyyy-MM-dd")+"'";
+                }
+                if (end.HasValue)
+                {
+                    sql += " and paid_time<'"+end.Value.AddDays(1).ToString("yyyy-MM-dd")+"'";
+                }
+
+
                 sql += " group by website order by website";
 
                 return cn.Query<string>(sql, sqlparam).AsList();

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

@@ -192,7 +192,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             var day = DateTime.Now;
 
             var start = DateTime.Parse(lastmonth.Year + "-" + lastmonth.Month + "-01");
-            var end = day.AddDays(-1);
+            var end = start.AddMonths(1).AddDays(-1);
 
             ViewBag.start = start;
             ViewBag.end = end;
@@ -221,6 +221,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             var list = new Services.FinanceReportServices().ListOtherCost(url);
             var listValue = new List<Tuple<string, List<decimal>>>();
             var listCol = new List<string>();
+            var listColVal = new List<int>();
 
             if (list.Count > 0)
             {
@@ -491,7 +492,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 a.feeSubType,
                 a.feeSuperType,
                 a.no,
-                a.manageCostType
+                a.manageCostType,
+                a.receiveUnit,
+                a.reason,
+                payTime = a.payTime.HasValue?a.payTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):""
             }).ToList();
             
 

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

@@ -1282,9 +1282,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="platform">平台编码</param>
         /// <returns></returns>
         [HttpPost]
-        public JsonResult ListWebSite(string platform)
+        public JsonResult ListWebSite(string platform,DateTime? start,DateTime? end)
         {
-            var result = Services.CommonServices.ListWebSite(platform).Where(a => !string.IsNullOrEmpty(a));
+            var result = Services.CommonServices.ListWebSite(platform,start,end).Where(a => !string.IsNullOrEmpty(a));
             return Json(result);
         }
 

Bailun.DC.Web/Areas/Reports/Views/Finance/ListAdministrativeCost.cshtml

@@ -62,6 +62,9 @@
                 { field: 'amount',title: '金额' },
                 { field: 'currency', title: '币种' },
                 { field: 'amountRmb', title: '人民币金额' },
+                { field: 'receiveUnit', title: '收款单位' },
+                { field: 'reason', title: '付款理由' },
+                { field: 'payTime', title: '付款时间' },
             ];
 
             var url = '@Url.Content("~/Reports/Finance/ListAdministrativeCostJson")' + '?paycompanyid=' + companyid + '&headname=' + headname + '&categoryname=' + categoryname + '&start=' + start + '&end=' + end + '&type=' + type + '&issub=' + issub;

Bailun.DC.Web/Areas/Reports/Views/Inventory/DataWareHouse.cshtml

@@ -27,6 +27,7 @@
                                     <option value="海外仓">海外仓</option>
                                     <option value="FBA仓">FBA仓</option>
                                     <option value="第三方仓库">第三方仓库</option>
+                                    <option value="耗材仓">耗材仓</option>
                                 </select>
                             </div>
                             <div class="form-group">

Bailun.DC.Web/Areas/Reports/Views/Orders/EbayStatisticsByWebsite.cshtml

@@ -199,10 +199,13 @@
         }
 
         function listWebsite() {
+            var start = $('#start').val();
+            var end = $('#end').val();
+
             $.submit({
                 url: '@Url.Content("~/Reports/Orders/ListWebSite")',
-                type:'POST',
-                paramData: 'platform=Ebay',
+                type: 'POST',
+                paramData: 'platform=Ebay&start=' + start+'&end='+end,
                 func: function (result) {
                     if (result != null && result != undefined) {
                         $('#website').html('<option value="">选择站点</option>');