Merge branch 'master' of https://code.bailuntec.com/bltdc/DataCenter_Core2.1_20190520

Bailun.DC.Models/DataWareHouse/order_fee_col.cs

@@ -34,5 +34,10 @@ namespace Bailun.DC.Models.DataWareHouse
         /// </summary>
         public int datatype { get; set; }
 
+        /// <summary>
+        /// 取值的判断条件，为空则没有判断条件
+        /// </summary>
+        public string conditioncol { get; set; }
+
     }
 }

Bailun.DC.Services/FinanceReportServices.cs

@@ -457,7 +457,7 @@ namespace Bailun.DC.Services
         /// <returns></returns>
         public string UpdateLogisticsEndAmount(DateTime day,decimal amount)
         {
-            var url = "http://fee.bailuntec.com/balanceSheet/updateSheetLogisticsSupplier?date="+day.ToString("yyyy-MM-dd")+"&logisticsPayableSum="+amount;
+            var url = "http://api.dcjava.bailuntec.com/updateSheetLogisticsSupplier?date=" + day.ToString("yyyy-MM-dd")+"&logisticsPayableSum="+amount;
 
             var result = Common.HttpHelper.NetHelper.Request(url);
 
@@ -481,7 +481,7 @@ namespace Bailun.DC.Services
         /// <returns></returns>
         public string UpdateLogisticsEndAmount(DateTime day, decimal amount,string paramname)
         {
-            var url = "http://fee.bailuntec.com/balanceSheet/updateSheetLogisticsSupplier?date=" + day.ToString("yyyy-MM-dd") + "&"+ paramname+"=" + amount;
+            var url = "http://api.dcjava.bailuntec.com/updateSheetLogisticsSupplier?date=" + day.ToString("yyyy-MM-dd") + "&"+ paramname+"=" + amount;
 
             var result = Common.HttpHelper.NetHelper.Request(url);
 

Bailun.DC.Web/Areas/DataWareHouse/Views/Logistics/List.cshtml

@@ -296,7 +296,7 @@
             $.submit({
                 url: '@Url.Content("~/DataWareHouse/Logistics/ListFlowingJson")',
                 type:'POST',
-                paramData: 'page=' + current_page + '&platform=' + platform + '&start=' + start + '&end=' + end + '&orderno=' + orderno + '&website=' + website ,
+                paramData: 'page=' + current_page + '&platform=' + platform + '&start=' + start + '&end=' + end + '&orderno=' + orderno + '&website=' + website+'&month='+month,
                 func: function (result) {
                     layer.close(load_index)
                     $('#tb_head').html('');