平台利润统计报表 ebay平台按月份显示时，增加4px的返利金额到利润上

Bailun.DC.Models/Bailun.DC.Models.csproj

@@ -5,6 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="Sku\dc_base_sku_finance_category.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.5" />
   </ItemGroup>
 

Bailun.DC.Models/Orders/dc_base_oms_sku.cs

@@ -575,5 +575,10 @@ namespace Bailun.DC.Models.Orders
         /// 物流费--物流商API获取
         /// </summary>
         public decimal? total_fee { get; set; }
+
+        /// <summary>
+        /// 4px物流返利
+        /// </summary>
+        public decimal? rebate_4px { get; set; } = 0;
     }
 }

Bailun.DC.Models/Sku/dc_base_sku_finance_category.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models.Sku
+{
+    /// <summary>
+    /// 百伦分类和财务分类的映射表
+    /// </summary>
+    public class dc_base_sku_finance_category
+    {
+        public int id { get; set; }
+
+        public int bailuncategoryid { get; set; }
+
+        public string bailuncategoryname { get; set; }
+
+        public int financecategoryid { get; set; }
+
+        public string financecategoryname { get; set; }
+
+        public string site { get; set; }
+
+        public DateTime createtime { get; set; }
+
+    }
+}

Bailun.DC.Models/dc_datawh_temp_stock.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    public class dc_datawh_temp_stock
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string bailun_sku { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string warehouse_code { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int usable_stock { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public decimal unit_price { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? category_id { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string categoryname { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string sku_title_cn { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string brand { get; set; }
+
+
+
+    }
+}

Bailun.DC.Models/dc_logistics_4px_rebate.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    /// <summary>
+    /// 4px 物流费用返利
+    /// </summary>
+    public class dc_logistics_4px_rebate
+    {
+        public int id { get; set; }
+
+        public string month { get; set; }
+
+        public decimal amount { get; set; }
+
+    }
+}

Bailun.DC.Services/LogisticsServices.cs

@@ -641,6 +641,27 @@ namespace Bailun.DC.Services
             }
         }
 
+        /// <summary>
+        /// 获取4px 月份返利金额
+        /// </summary>
+        /// <param name="month">月份</param>
+        /// <returns></returns>
+        public dc_logistics_4px_rebate Get4PXLogisticsRebateFee(string month)
+        {
+            var sql = $@"select * from dc_logistics_4px_rebate where month='"+month+"'";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.QueryFirstOrDefault<dc_logistics_4px_rebate>(sql);
 
+                return obj;
+            }
+
+        }
     }
 }

Bailun.DC.Services/SkuInfoServices.cs

@@ -314,6 +314,26 @@ join dc_base_sku t2 on t1.bailuncategoryid = t2.bailun_category_id and t2.bailun
             
         }
 
+        /// <summary>
+        /// 获取财务分类列表
+        /// </summary>
+        /// <returns></returns>
+        public List<dc_base_sku_finance_category> ListFinanceCategory()
+        {
+            var sql = $@"select financecategoryid,financecategoryname from dc_base_sku_finance_category t1 group by t1.financecategoryname";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                return cn.Query<dc_base_sku_finance_category>(sql).ToList();
+
+            }
+        }
+
 
         /// <summary>
         /// 获取SKU的所有品牌列表

Bailun.DC.SkuDataWareHouse/Services.cs

@@ -27,14 +27,16 @@ namespace Bailun.DC.SkuDataWareHouse
             {
                 var now = DateTime.Now;
 
-                if (now.Hour == 5 && now.Minute == 1)
+                if (now.Hour == 12 && now.Minute == 1)
                 {
                     Save();
+
+                    UpdateAllotOnWay();
                 }
 
                 if (now.Minute % 30==0) //每30分钟更新一次
                 {
-                    UpdateAllotOnWay();
+                    //UpdateAllotOnWay();
                 }
 
             }
@@ -59,13 +61,36 @@ namespace Bailun.DC.SkuDataWareHouse
 
                     cn.Execute("truncate dc_datawarehouse;", 5 * 60);
 
-                    var page = 1;
-                    var pagesize = 8000;
-                    var listcount = cn.QueryFirstOrDefault<int>("select count(id) from dc_base_stock");
-                    var resultcount = 0;
+                    cn.Execute("truncate dc_datawh_temp_stock;", 5 * 60);
+                }
+
+
 
-                    while (page == 1 || (resultcount == pagesize && resultcount != 0))
+                var page = 1;
+                var pagesize = 8000;
+                var listcount = 0; 
+                var resultcount = 0;
+
+                using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
+                {
+                    if(cn.State== System.Data.ConnectionState.Closed)
+                    {
+                        cn.Open();
+                    }
+
+                    listcount = cn.QueryFirstOrDefault<int>("select count(id) from dc_datawh_temp_stock");
+                }
+
+                while (page == 1 || (resultcount == pagesize && resultcount != 0))
+                {
+                    var liststock = new List<dc_datawarehouse>();
+                    using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
                     {
+                        if(cn.State== System.Data.ConnectionState.Closed)
+                        {
+                            cn.Open();
+                        }
+
                         var strlimit = (((page - 1) * pagesize) + "," + pagesize);
                         var sql = $@"select t2.hq_type as warehousetype,t2.warehouse_name as warehousename,t2.warehouse_code,t1.bailun_sku as sku,t1.category_id,t1.categoryname,t1.sku_title_cn as skuname,(case when t4.status=1 then 0 else 1 end) monitorstatus,t5.clearancestatus,(case when t8.id is not null then 1 else 0 end) as tortstatus,t5.str_skutag,t1.unit_price as buyprice,t1.usable_stock,(t1.usable_stock*t1.unit_price) amount_stock,t6.quantity_purchase,(t6.quantity_purchase*t1.unit_price) as purchase_amount,t6.quantity_transfer,(t6.quantity_transfer*t1.unit_price) amount_transit,t6.quantity_out_stock,t7.oneday_total_sales,(t7.oneday_total_sales*t1.unit_price) as amount_onedaysale,t7.sevenday_total_sales,(t7.sevenday_total_sales*t1.unit_price) amount_sevendaysale,t7.fourteenday_total_sales,t7.thirtyday_total_sales,t7.sevenday_average_sales,t7.fourteenday_average_sales,t7.thirtyday_average_sales,t1.create_time as skucreatetime,t2.area_id,t2.area_name,t1.brand as skubrand,(case when t9.id is not null then 1 else 0 end) as is_redundancy
                                 from (select t01.bailun_sku,t01.warehouse_code,t01.usable_stock,t02.unit_price,t02.create_time,t02.bailun_category_id as category_id,t02.bailun_category_name as categoryname,t02.sku_title_cn,t02.brand from dc_base_stock t01 
@@ -80,36 +105,38 @@ namespace Bailun.DC.SkuDataWareHouse
                                 left join dc_base_tort t8 on t1.bailun_sku=t8.bailun_sku
                                 left join dc_auto_forecast_fluctuation t9 on t1.bailun_sku=t9.bailun_sku and t1.warehouse_code=t9.warehouse_code and t9.type=3
                                 ";
-                                
 
-                        var liststock = cn.Query<dc_datawarehouse>(sql, null, null, true, 30 * 60);
 
-                        resultcount = liststock.AsList().Count;
+                       liststock = cn.Query<dc_datawarehouse>(sql, null, null, true, 30 * 60).AsList();
+                    }
+                    
 
-                        var str = @"insert dc_datawarehouse (warehousetype,area_id,area_name,warehousename,warehouse_code,sku,category_id,categoryname,skuname,monitorstatus,clearancestatus,tortstatus,str_skutag,buyprice,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,quantity_out_stock,oneday_total_sales,amount_onedaysale,sevenday_total_sales,amount_sevendaysale,fourteenday_total_sales,thirtyday_total_sales,sevenday_average_sales,fourteenday_average_sales,thirtyday_average_sales,skucreatetime,lastupdatetime,skubrand,is_redundancy) values ";
-                        foreach (var item in liststock)
-                        {
-                            if (!string.IsNullOrEmpty(item.categoryname))
-                            {
-                                item.categoryname = item.categoryname.Replace("'", "");
-                            }
-                            
-                            str += $@"('{item.warehousetype}','{item.area_id??0}','{item.area_name}','{item.warehousename}','{item.warehouse_code}','{item.sku}',{item.category_id??0},'{(!string.IsNullOrEmpty(item.categoryname) ? item.categoryname : "")}','{item.skuname.Replace("'", "")}',{item.monitorstatus??1},{item.clearancestatus??0},{item.tortstatus??0},'{item.str_skutag}',{item.buyprice??0},{item.usable_stock??0},{item.amount_stock??0},{item.quantity_purchase??0},{item.purchase_amount??0},{item.quantity_transfer??0},{item.amount_transit??0},{item.quantity_out_stock??0},{item.oneday_total_sales??0},{item.amount_onedaysale??0},{item.sevenday_total_sales??0},{item.amount_sevendaysale??0},{item.fourteenday_total_sales??0},{item.thirtyday_total_sales??0},{item.sevenday_average_sales??0},{item.fourteenday_average_sales??0},{item.thirtyday_average_sales??0},'{(item.skucreatetime.HasValue?item.skucreatetime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"1970-01-01")}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}','{item.skubrand.Replace("'","''")}',{(item.is_redundancy??0)}),";
-                        }
-                        if (resultcount > 0)
-                        {
-                            str = str.Substring(0, str.Length - 1);
+                    resultcount = liststock.AsList().Count;
 
-                            cn.Execute(str, null, null, 5 * 60);
-                            Console.WriteLine("当前页：" + page + ",每页记录：" + pagesize + "；" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    var str = @"insert dc_datawarehouse (warehousetype,area_id,area_name,warehousename,warehouse_code,sku,category_id,categoryname,skuname,monitorstatus,clearancestatus,tortstatus,str_skutag,buyprice,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,quantity_out_stock,oneday_total_sales,amount_onedaysale,sevenday_total_sales,amount_sevendaysale,fourteenday_total_sales,thirtyday_total_sales,sevenday_average_sales,fourteenday_average_sales,thirtyday_average_sales,skucreatetime,lastupdatetime,skubrand,is_redundancy) values ";
+                    foreach (var item in liststock)
+                    {
+                        if (!string.IsNullOrEmpty(item.categoryname))
+                        {
+                            item.categoryname = item.categoryname.Replace("'", "");
                         }
 
-                        page++;
+                        str += $@"('{item.warehousetype}','{item.area_id ?? 0}','{item.area_name}','{item.warehousename}','{item.warehouse_code}','{item.sku}',{item.category_id ?? 0},'{(!string.IsNullOrEmpty(item.categoryname) ? item.categoryname : "")}','{item.skuname.Replace("'", "")}',{item.monitorstatus ?? 1},{item.clearancestatus ?? 0},{item.tortstatus ?? 0},'{item.str_skutag}',{item.buyprice ?? 0},{item.usable_stock ?? 0},{item.amount_stock ?? 0},{item.quantity_purchase ?? 0},{item.purchase_amount ?? 0},{item.quantity_transfer ?? 0},{item.amount_transit ?? 0},{item.quantity_out_stock ?? 0},{item.oneday_total_sales ?? 0},{item.amount_onedaysale ?? 0},{item.sevenday_total_sales ?? 0},{item.amount_sevendaysale ?? 0},{item.fourteenday_total_sales ?? 0},{item.thirtyday_total_sales ?? 0},{item.sevenday_average_sales ?? 0},{item.fourteenday_average_sales ?? 0},{item.thirtyday_average_sales ?? 0},'{(item.skucreatetime.HasValue ? item.skucreatetime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "1970-01-01")}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}','{item.skubrand.Replace("'", "''")}',{(item.is_redundancy ?? 0)}),";
                     }
+                    if (resultcount > 0)
+                    {
+                        str = str.Substring(0, str.Length - 1);
 
-                    Console.WriteLine("运行成功，时间：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                        cn.Execute(str, null, null, 5 * 60);
+                        Console.WriteLine("当前页：" + page + ",每页记录：" + pagesize + "；" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    }
 
+                    page++;
                 }
+
+                Console.WriteLine("运行成功，时间：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+
+
             }
             catch (Exception ex)
             {

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

@@ -1920,6 +1920,33 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     //利润减去广告费和刊登费
                     if (item.platform_type.ToLower() == "ebay")
                     {
+                        //判断是否是按月份搜索，如果是，则加上4px的返利利润
+                        //Add by Allan at 20210317
+                        if(IsMonth(start,end) || IsMonth(shipstart,shipend))
+                        {
+                            var _str_month = "";
+                            if (start.HasValue)
+                            {
+                                _str_month = start.Value.ToString("yyyy-MM");
+                            }
+                            else if (shipstart.HasValue)
+                            {
+                                _str_month = shipstart.Value.ToString("yyyy-MM");
+                            }
+
+                            if (!string.IsNullOrEmpty(_str_month))
+                            {
+                                var _4pxRebate = new Services.LogisticsServices().Get4PXLogisticsRebateFee(_str_month);
+                                if (_4pxRebate != null)
+                                {
+                                    item.rebate_4px = _4pxRebate.amount;
+                                    item.profit_total += _4pxRebate.amount;
+                                }
+                            }
+                        }
+                        //End Add
+
+
                         item.adfee = ebayADFee != null ? ebayADFee.gross_amount_rmb : 0;
                         item.putawayfee = ebayPutAway != null ? ebayPutAway.gross_amount_rmb : 0;
 
@@ -2061,7 +2088,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     cost_fba_fee = result.Sum(a => a.cost_fba_fee),
                     cost_paypal_fee = result.Sum(a => a.cost_paypal_fee),
                     adfee = result.Sum(a => a.adfee),
-                    putawayfee = result.Sum(a => a.putawayfee)
+                    putawayfee = result.Sum(a => a.putawayfee),
+                    rebate_4px = result.Sum(a => a.rebate_4px)??0,
                 };
                 result.Add(m);
             }
@@ -2091,6 +2119,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 adfee = (p.adfee ?? 0).ToString("N2"),
                 putawayfee = (p.putawayfee ?? 0).ToString("N2"),
                 id = p.id,
+                rebate_4px = (p.rebate_4px??0).ToString("N2")
 
             }).ToList();
 
@@ -4295,7 +4324,31 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
         #region private
 
+        /// <summary>
+        /// 判断时间段是不是自然月份
+        /// </summary>
+        /// <param name="start">开始时间</param>
+        /// <param name="end"></param>
+        /// <returns></returns>
+        public bool IsMonth(DateTime? start, DateTime? end)
+        { 
+            if(!start.HasValue || !end.HasValue)
+            {
+                return false;
+            }
+
+            if (start.Value.ToString("yyyy-MM") != end.Value.ToString("yyyy-MM"))
+            {
+                return false;
+            }
+
+            if (start.Value.Day == 1 && end.Value.Day >= 28)
+            {
+                return true;
+            }
 
+            return false;
+        }
 
 
         #endregion

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

@@ -46,15 +46,29 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         }
 
         /// <summary>
+        /// 获取财务分类列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public JsonResult ListFinanceCategory()
+        {
+            var list = new Services.SkuInfoServices().ListFinanceCategory();
+
+            return Json(list);
+        }
+
+        /// <summary>
         /// 逻辑仓库 库存列表
         /// </summary>
         /// <param name="parameter">分页信息</param>
         /// <param name="warehousetype">仓库类型</param>
         /// <param name="warehouse">仓库编码</param>
+        /// <param name="isfinish">成品或原料，1：成品，2：原料</param>
+        /// <param name="category">产品类型</param>
         /// <returns></returns>
         [BailunAuthentication(LoginMode.Enforce)]
         [BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库存周转报表】->【逻辑仓库】->【查询】页面", 0)]
-        public string LogicWarehouseJson(BtTableParameter parameter, string warehousetype, string warehousecode)
+        public string LogicWarehouseJson(BtTableParameter parameter, string warehousetype, string warehousecode,int? isfinish,string category)
         {
             var user = HttpContextHelper.Current?.User;
 

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

@@ -210,7 +210,7 @@
 
             laydate.render({ elem: '#shipstart' });
             laydate.render({ elem: '#shipend' });
-            
+
             list();
 
             listPlatform();
@@ -240,13 +240,13 @@
             else if ('@ViewBag.statistictype' == '2') {
                 $('#content_producttype').show();
             }
-            
+
         })
 
         function list() {
 
             var producttype = $("#producttype").ySelectedValues(",");
-            
+
             var shipstart = $('#shipstart').val();
             var shipend = $('#shipend').val();
             var start = $('#start').val();
@@ -300,7 +300,7 @@
                                 s += '<td>' + result[i].putawayfee + '</td>';
                                 s += '<td class="skuprofit" onclick="ShowSkuProfit(\'' + result[i].platform_type + '\',\'预收款\',\'amount_prepaid\',1)" title="查看sku分类利润">' + result[i].amount_prepaid + '</td>';
                                 s += '<td class="skuprofit" onclick="ShowSkuProfit(\'' + result[i].platform_type + '\',\'预收订单数\',\'noshippingcount\',1)" title="查看sku分类利润">' + result[i].noshippingcount + '</td>';
-                                s += '<td class="skuprofit" onclick="ShowSkuProfit(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)" title="查看sku分类利润">' + result[i].profit_total + '</td>';
+                                s += '<td class="skuprofit" onclick="ShowSkuProfit(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)" title="查看sku分类利润">' + result[i].profit_total + (result[i].rebate_4px == 0 ? '' : '<img style="width:16px;margin-left:3px" src="@Url.Content("~/img/icon-quetion.png")" title="4px物流返利：' + result[i].rebate_4px+'" />') + '</td>';
                                 s += '<td><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\');" title="点击查看利润曲线图"></td>';
                                 s += '<td>' + result[i].profit_rate + '</td>';
                                 //s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'退款金额\',\'amount_refund\',1)" title="查看订单明细">' + result[i].amount_refund + '</td>';
@@ -440,7 +440,7 @@
                             $('#footer').append(foot_s);
                         }
 
-                        
+
                     }
                     else {
                         objData = null;
@@ -491,7 +491,7 @@
                     }
                 }
             })
-            
+
         }
 
         function ShowWebsite(platform) {
@@ -505,7 +505,7 @@
 
                 layer_show(platform + ' 按站点统计', '@Url.Content("~/Reports/Orders/PlatformProfitCountByWebSite?platform=")' + platform + '&start=' + start + '&end=' + end, '90%', '90%');
             }
-            
+
         }
 
         function ShowDetail(platform, coltitle, colval, single) {
@@ -604,7 +604,7 @@
                 return false;
             }
 
-            
+
             layer_show(platform + " " + title+"曲线图", '@Url.Content("~/Reports/Orders/OrderProfitGraph?platform=")' + platform + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&col=' + colval + '&shipstart=' + $('#shipstart').val() + '&shipend=' + $('#shipend').val() + '&currency=' + $('#currency').val() + '&skucategoryids=' + s + '&titlename=' + title, '90%', '90%');
         }
 
@@ -642,7 +642,7 @@
             if (explorer.indexOf("MSIE") >= 0) {
                 alert('该功能仅支持谷歌浏览器');
                 return;
-            } 
+            }
 
             if (objData != null && objData != undefined) {
 
@@ -667,11 +667,11 @@
                 link.click()
                 document.body.removeChild(link);
             }
-           
+
 
         }
 
-        
+
 
 
 

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

@@ -30,6 +30,20 @@
                         </select>
                     </div>
                     <div class="form-group">
+                        <label></label>
+                        <select id="isfinish" name="isfinish" class="form-control" style="width:160px;">
+                            <option value="">选择成品或原料</option>
+                            <option value="1">成品</option>
+                            <option value="2">原料</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label></label>
+                        <select id="category" name="category" class="form-control" style="width:160px;">
+                            <option value="">选择产品类型</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
                         <label>&nbsp;</label>
                         <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
                         <button id="btnexport" style="display:none" type="button" class="btn btn-success" onclick="exportxls()">导出</button>
@@ -69,6 +83,18 @@
                 listwarehouse();
             })
 
+            $('#isfinish').change(function () {
+                if ($(this).val() == '') {
+                    $('#category').html('<option value="">产品类型</option>');
+                }
+                else if ($(this).val() == 1) {  //成品
+                    listFinanceCategory();
+                }
+                else {  //半成品
+                    listSemiCategory();
+                }
+            })
+
         })
 
         function list() {
@@ -302,10 +328,64 @@
             }
 
             var url = 'http://oms.bailuntec.com/#/bailun-order/all-orders?baseQueryKey=SkuNo_Accurate&dateType=payTime&daterange=' + start + '&daterange=' + end + '&wareNo=' + warehousecode + '&orderStatus=0&orderStatus=1&orderStatus=3';
-            
+
             layer_show(name + " 的订单明细", url, '90%', '90%');
         }
 
+        var financecategory;
+        function listFinanceCategory() {
+            if (financecategory == undefined) {
+                $.submit({
+                    url: '@Url.Content("~/Reports/Warehouse/ListFinanceCategory")',
+                    paramData: '',
+                    type: 'POST',
+                    func: function (result) {
+                        if (result != null && result != undefined) {
+                            financecategory = result;
+
+                            $('#category').html('<option value="">产品类型</option>');
+                            for (var i in financecategory) {
+                                $('#category').append('<option value="' + financecategory[i].financecategoryid + '">' + financecategory[i].financecategoryname + '</option>');
+                            }
+                        }
+                    }
+                })
+            }
+            else {
+                $('#category').html('<option value="">产品类型</option>');
+                for (var i in financecategory) {
+                    $('#category').append('<option value="' + financecategory[i].financecategoryid + '">' + financecategory[i].financecategoryname + '</option>');
+                }
+            }
+        }
+
+        var semiCategory;
+        function listSemiCategory() {
+            if (semiCategory == undefined) {
+                $.submit({
+                    url: '@Url.Content("~/Reports/Warehouse/ListFinanceCategory")',
+                    paramData: '',
+                    type: 'POST',
+                    func: function (result) {
+                        if (result != null && result != undefined) {
+                            semiCategory = result;
+
+                            $('#category').html('<option value="">产品类型</option>');
+                            for (var i in semiCategory) {
+                                $('#category').append('<option value="' + semiCategory[i].financecategoryid + '">' + semiCategory[i].financecategoryname + '</option>');
+                            }
+                        }
+                    }
+                })
+            }
+            else {
+                $('#category').html('<option value="">产品类型</option>');
+                for (var i in semiCategory) {
+                    $('#category').append('<option value="' + semiCategory[i].financecategoryid + '">' + semiCategory[i].financecategoryname + '</option>');
+                }
+            }
+        }
+
     </script>
 
 }