1、每日销进比汇总报表增加总计

2、平台利润统计报表的按发货时间获取的退款金额改为排除未发货的退款金额

Bailun.DC.Services/OrdersServices.cs

@@ -4301,7 +4301,7 @@ namespace Bailun.DC.Services
         /// <param name="website"></param>
         /// <param name="isUSD"></param>
         /// <returns></returns>
-        public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD)
+        public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD,bool containNotShipping)
         {
             var sqlparam = new DynamicParameters();
             var sql = $"select t1.platform_type,{(isUSD? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 where t1.order_status!='Canceled' and t1.is_deleted=0 and is_freeze=0 ";
@@ -4335,6 +4335,11 @@ namespace Bailun.DC.Services
                 sqlparam.Add("end", end.Value.AddDays(1));
             }
 
+            if (!containNotShipping)
+            {
+                sql += " and t1.shipping_status!='UnShipping'";
+            }
+
             sql += " group by t1.platform_type";
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))

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

@@ -1387,16 +1387,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                 dtstart = shipstart;
                 dtend = shipend;
+                listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD",false);  //不包含未发货的退款金额
             }
             else
             {
                 result = _service.ListPlatformProfit(platform,website,start, end, shipstart, shipend, currency.ToUpper() == "USD", companyid, skucategoryids);
+                listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD",true);   //包含未发货的退款金额
             }
 
             ebayADFee = _service.EbayFeeCount(companyid, dtstart, dtend, ADfeeType, "", "", currency.ToUpper() == "USD");
             ebayPutAway = _service.EbayFeeCount(companyid, dtstart, dtend, PutAwayFeeType, "", "", currency.ToUpper() == "USD");
             var amazonAD = _service.ListAmazonADSkuCount("", dtstart, dtend, companyid, currency.ToUpper() == "USD");
-            listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD");
+            
 
              foreach (var item in result)
             {

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

@@ -856,6 +856,30 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 }
             }
 
+            if (data.Count > 0)
+            {
+                var m = new SkuCategory_Col {
+                    category_simple_name = "总计",
+                    list = new List<string>()
+                };
+
+                foreach (var item in data)
+                {
+                    for (var i = 0; i < item.list.Count; i++)
+                    {
+                        if (m.list.Count > i)
+                        {
+                            m.list[i] = (decimal.Parse(m.list[i]) + decimal.Parse(item.list[i])).ToString();
+                        }
+                        else
+                        {
+                            m.list.Add(item.list[i]);
+                        }
+                    }
+                }
+
+                data.Add(m);
+            }
 
             return Json(new {
                 success = true,

Bailun.DC.Web/Areas/Reports/Views/Warehouse/DailyPurchaseSalesCount.cshtml

 
 @{
-    ViewData["Title"] = "Sku采购发货差异汇总";
+    ViewData["Title"] = "每日销进差异汇总";
     Layout = "~/Pages/Shared/_MainLayout.cshtml";
-    ViewBag.Nav = new string[] { "库存", "Sku采购发货差异汇总" };
+    ViewBag.Nav = new string[] { "库存", "每日销进差异汇总" };
 }
 
 <div class="row">
@@ -126,7 +126,12 @@
 
                             if (obj.list.length > 0) {
                                 for (var j = 0; j < obj.list.length; j++) {
-                                    s += ('<td style="width:160px;"><a  onclick="showdetail(\'' + obj.category_simple_name + '\',\'' + result.head[j + 1] +'\')">' + obj.list[j] + '</a></td>')
+                                    if (obj.category_simple_name == '总计') {
+                                        s += ('<td style="width:160px;">' + obj.list[j] + '</td>');
+                                    }
+                                    else {
+                                        s += ('<td style="width:160px;"><a  onclick="showdetail(\'' + obj.category_simple_name + '\',\'' + result.head[j + 1] + '\')">' + obj.list[j] + '</a></td>');
+                                    }
                                 }
                             }