更新页面

Bailun.DC.Models/mCashier.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    public class mCashier
+    {
+        //code,detail_name,type_name,companymain_name_from,paymoney_rmb,cashier_paymoneyrmb,cashier_time
+        public string code { get; set; }
+
+        public string detail_name { get; set; }
+
+        public string type_name { get; set; }
+
+        public string companymain_name_from { get; set; }
+
+        public decimal paymoney_rmb { get; set; }
+
+        public decimal cashier_paymoneyrmb { get; set; }
+
+        public DateTime cashier_time { get; set; }
+    }
+}

Bailun.DC.Services/FinanceReportServices.cs

@@ -1508,21 +1508,29 @@ namespace Bailun.DC.Services
         /// <param name="start">开始日期</param>
         /// <param name="end">结束日期</param>
         /// <returns></returns>
-        public List<dc_base_finance_cashier> ListHeadLogisticPay(DateTime start, DateTime end)
+        public List<mCashier> ListHeadLogisticPay(DateTime start, DateTime end)
         {
-            var sql = $"select code,detail_name,type_name,companymain_name_from,paymoney_rmb,cashier_paymoneyrmb,cashier_time from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ;
-
-            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            try
             {
-                if (cn.State == ConnectionState.Closed)
+                var sql = $"select code,detail_name,type_name,companymain_name_from,paymoney_rmb,cashier_paymoneyrmb,cashier_time from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ;
+
+                using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
                 {
-                    cn.Open();
-                }
+                    if (cn.State == ConnectionState.Closed)
+                    {
+                        cn.Open();
+                    }
 
-                var obj = cn.Query<dc_base_finance_cashier>(sql, null, null, 2 * 60).AsList();
+                    var obj = cn.Query<mCashier>(sql, null, null, 2 * 60).AsList();
 
-                return obj;
+                    return obj;
+                }
             }
+            catch (Exception ex)
+            {
+                return new List<mCashier>();
+            }
+            
         }
 
 

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

@@ -176,7 +176,7 @@
 
             if (rows == 1) { //管理成本
                 if (categoryname.indexOf('销售') > 0) {
-                    layer_show(categoryname + ' 管理成本明细', '@Url.Content("~/Reports/Finance/ListPayAdminCost?type=3&start=")' + start_time.toLocaleDateString() + '&end=' + end_time.toLocaleDateString(), '90%', '90%');
+                    layer_show(categoryname + ' 管理成本明细', '@Url.Content("~/Reports/Finance/ListPayAdminCost?start=")' + start_time.toLocaleDateString() + '&end=' + end_time.toLocaleDateString() +'&type=3', '90%', '90%');
                 }
                 else {
                     layer_show(categoryname + ' 管理成本明细', '@Url.Content("~/Reports/Finance/ListPayAdminCostCount?start=")' + start_time.toLocaleDateString() + '&end=' + end_time.toLocaleDateString(), '90%', '90%');