调整产品类型和来源

Bailun.DC.Models/Sku/dc_base_sku.cs

@@ -15,15 +15,11 @@ namespace Bailun.DC.Models
     public enum SkuSource
     {
         未设置=0,
-        线上 = 1,
-        线下 = 2,
-        美容线下 = 3,
-        线下供应商推荐 = 4,
-        登宇服装 = 5,
-        线上供应商 = 6,
-        服装 = 7,
-        万邑通分销 = 9,
-        托尼斯 = 10,
-        无库供应商 = 11
+        精准开发 = 1,
+        线下其他 = 2,
+        线下美容 = 3,
+        普货供应商推荐 = 6,
+        服务供应商推荐 = 7,
+        无库供应商推荐 = 11
     }
 }

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

@@ -1532,9 +1532,32 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         {
             var _skuService = new Services.SkuInfoServices();
 
-            ViewBag.listSkuType = _skuService.ListSkuProductType().Where(a=>!string.IsNullOrEmpty(a.product_type_desc)).ToList();
+            var listProductType = _skuService.ListSkuProductType().Where(a=>!string.IsNullOrEmpty(a.product_type_desc)).ToList();
+            int index = -1;
+            var list = new List<Models.Sku.mSku_ProductType>();
+            foreach (var item in listProductType)
+            {
+                if (item.product_type == 5 || item.product_type == 13)
+                {
+                    if (index != -1)
+                    {
+                        list.Insert(index, item);
+                    }
+                    else
+                    {
+                        index = listProductType.IndexOf(item);
+                        list.Add(item);
+                    }
+                }
+                else
+                {
+                    list.Add(item);
+                }
+            }
 
-            ViewBag.listSource = _skuService.ListSkuSource();
+            
+            ViewBag.listSkuType = list;
+            ViewBag.listSource = _skuService.ListSkuSource().Where(a=>a==1||a==3||a==6||a==7).ToList(); //精准开发，线下美容，普货供应商推荐，服务供应商推荐
 
             
             return View();

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

@@ -88,7 +88,8 @@
                                     <option value="">选择发货策略</option>
                                     <option value="1">专线</option>
                                     <option value="2">中国发货</option>
-                                    <option value="3">美国仓</option>
+                                    <option value="3">海外仓</option>
+                                    <option value="4">FBA仓</option>
                                 </select>
                             </div>