Skip to content

D
DataCenter_Core2.1_20190520
Commit a68509ea by guanzhenshan
Options

修改报表搜索分类，改为百伦简单分类

parent 35a2894b
Showing with 616 additions and 244 deletions
Bailun.DC.Models/dc_base_sku_simple_category.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models
{
public class dc_base_sku_simple_category
{
public int id { get; set; }
/// <summary>
/// 父类id
/// </summary>
public int parent_id { get; set; }
/// <summary>
/// 简单分类短名称
/// </summary>
public string name { get; set; }
/// <summary>
/// 简单分类全名称
/// </summary>
public string full_name { get; set; }
/// <summary>
/// 级别
/// </summary>
public int level { get; set; }
/// <summary>
/// 简单分类Id
/// </summary>
public int skums_id { get; set; }
/// <summary>
/// 数据中心创建时间
/// </summary>
public DateTime bj_create { get; set; }
/// <summary>
/// 数据中心更新时间
/// </summary>
public DateTime bj_modified { get; set; }
}
}
Bailun.DC.Services/OrdersServices.cs
......@@ -44,24 +44,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ")";
sql += " and t4.category_simple_id in (" + s + ")";
}
}
......@@ -143,24 +145,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ")";
sql += " and t4.category_simple_id in (" + s + ")";
}
}
......@@ -345,24 +349,24 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
//sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += " join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku ";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
}
......@@ -470,24 +474,26 @@ namespace Bailun.DC.Services
}
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ")";
sql += " and t4.category_simple_id in (" + s + ")";
}
}
......@@ -555,24 +561,27 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
......@@ -634,24 +643,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
......@@ -711,24 +722,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t5 on t1.bailun_order_id=t5.bailun_order_id ";
sql += @" join dc_base_oms_sku t5 on t1.bailun_order_id=t5.bailun_order_id
join dc_base_sku t6 on t5.bailun_sku=t6.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t5.bailun_category_id in (" + s + ") ";
sql += " and t6.category_simple_id in (" + s + ") ";
}
}
......@@ -861,24 +874,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t5 on t1.bailun_order_id=t5.bailun_order_id ";
sql += @" join dc_base_oms_sku t5 on t1.bailun_order_id=t5.bailun_order_id
join dc_base_sku t6 on t5.bailun_sku=t6.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t5.bailun_category_id in (" + s + ") ";
sql += " and t6.category_simple_id in (" + s + ") ";
}
}
......@@ -1168,34 +1183,37 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = "select t1.origin_order_id,t1.platform_type,t1.website,t1.seller_account,t1.bailun_sku,t1.order_currency,t1.cost_fba_fee,(t1.cost_fba_fee*t1.seller_order_exchange_rate) fba_fee_rmb,t2.average_fba_fee,t2.min_fba_fee,t2.max_fba_fee,t1.create_time,t1.seller_order_exchange_rate";
var strwhere = " from dc_base_oms_sku t1 ";
var strwhere = " from dc_mid_fba_fee_avg t2 ";
strwhere += " join dc_mid_fba_fee_avg t2 on t1.bailun_sku=t2.bailun_sku and t1.website=t2.website ";
strwhere += " where t1.bailun_order_status!='Canceled' and ((t1.platform_type!='FBA' and t1.bailun_order_status!='CantHandle') or t1.platform_type='FBA') and t1.has_scalp=0 and t1.has_innersale=0 and t1.platform_type in ('Amazon','FBA') and t1.has_fba_exception=1 ";
strwhere += " join (select t1.* from dc_base_oms_sku t1 ";
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
strwhere += " join dc_base_sku t4 on t1.bailun_sku=t4.bailun_sku";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
strwhere += " and t1.bailun_category_id in (" + s + ") ";
strwhere += " and t4.category_simple_id in (" + s + ") ";
}
}
}
strwhere += " where t1.bailun_order_status!='Canceled' and ((t1.platform_type!='FBA' and t1.bailun_order_status!='CantHandle') or t1.platform_type='FBA') and t1.has_scalp=0 and t1.has_innersale=0 and t1.platform_type in ('Amazon','FBA') and t1.has_fba_exception=1 and t1.company_id=1 ";
if (companyid.HasValue && companyid.Value > 0)
{
strwhere += " and t1.company_id=" + companyid.Value; //增加公司id过滤
......@@ -1231,6 +1249,8 @@ namespace Bailun.DC.Services
sqlparam.Add("paid_time_end", end.Value.AddDays(1));
}
strwhere += " ) t1 on t1.bailun_sku=t2.bailun_sku and t1.website=t2.website";
if (!string.IsNullOrWhiteSpace(parameter.sort))
{
strwhere += " order by " + parameter.sort;
......@@ -1252,7 +1272,6 @@ namespace Bailun.DC.Services
return obj.AsList();
}
}
......@@ -1264,24 +1283,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
strwhere += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
strwhere += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
strwhere += " and t3.bailun_category_id in (" + s + ") ";
strwhere += " and t4.category_simple_id in (" + s + ") ";
}
}
......@@ -1381,24 +1402,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
strwhere += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
strwhere += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
strwhere += " and t3.bailun_category_id in (" + s + ") ";
strwhere += " and t4.category_simple_id in (" + s + ") ";
}
}
......@@ -1493,25 +1516,27 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on tb.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on tb.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ") ";
//sql += " and t3.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in ("+s+")";
}
}
}
......@@ -1605,29 +1630,6 @@ namespace Bailun.DC.Services
sql += " join dc_base_oms_sku t2 on t1.bailun_order_id = t2.bailun_order_id and t1.bailun_sku=t2.bailun_sku and t2.bailun_order_status != 'Canceled' and t2.has_scalp = 0 and ((t2.platform_type!='FBA' and t2.bailun_order_status!='CantHandle') or t2.platform_type='FBA') and t2.has_scalp = 0 and t2.has_innersale = 0 and t2.has_delete=0 ";
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
if (!string.IsNullOrEmpty(s))
{
sql += " and t2.bailun_category_id in (" + s + ") ";
}
}
}
//if (companyid.HasValue && companyid.Value > 0)
//{
// sql += " and t2.company_id=" + companyid.Value; //增加公司id过滤
......@@ -1658,6 +1660,30 @@ namespace Bailun.DC.Services
sqlparam.Add("paid_time_end", end.Value.AddDays(1));
}
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_sku t4 on t2.bailun_sku=t4.bailun_sku ";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
//sql += " and t4.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in ("+s+") ";
}
}
}
var strwhere = " ";
strwhere += " group by t2.platform_type";
......@@ -2461,24 +2487,26 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
}
......@@ -2553,30 +2581,32 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
}
var sqlwhere = " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
var sqlwhere = " where t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
if (companyid.HasValue && companyid.Value > 0)
{
......@@ -2585,6 +2615,11 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(platform))
{
if (platform.ToUpper().Trim() != "FBA")
{
sqlwhere += " and t1.bailun_order_status!='CantHandle' ";
}
sqlwhere += " and t1.platform_type=@platform ";
sqlparam.Add("platform", platform);
}
......@@ -2683,31 +2718,33 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
sql += " join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id ";
sql += @" join dc_base_oms_sku t3 on t1.bailun_order_id=t3.bailun_order_id
join dc_base_sku t4 on t3.bailun_sku=t4.bailun_sku
";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t3.bailun_category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
}
var fromsql = " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
var fromsql = " where t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
if (companyid.HasValue && companyid.Value > 0)
{
......@@ -2716,6 +2753,11 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(platform))
{
if (platform.ToUpper().Trim() != "FBA")
{
fromsql += " and t1.bailun_order_status!='CantHandle' ";
}
fromsql += " and t1.platform_type=@platform";
sqlparam.Add("platform", platform);
}
......
Bailun.DC.Services/SkuInfoServices.cs
......@@ -4,6 +4,7 @@ using System.Text;
using Bailun.DC.Models;
using Dapper;
using MySql.Data.MySqlClient;
using System.Linq;
namespace Bailun.DC.Services
{
......@@ -146,6 +147,46 @@ namespace Bailun.DC.Services
}
}
/// <summary>
/// 获取百伦简单分类一二级
/// </summary>
/// <returns></returns>
public List<Models.Api.mSkuCategoryTree> ListSimpleCategory12(int? companyid)
{
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
var sql = "select id,parent_id,name,full_name,level,skums_id from dc_base_sku_simple_category ";
var obj = cn.Query<dc_base_sku_simple_category>(sql).AsList();
var list = new List<Models.Api.mSkuCategoryTree>();
var onelevel = obj.Where(a => a.level == 1);
foreach (var item in onelevel)
{
var chidren = obj.Where(a => a.parent_id == item.skums_id);
var m = new Models.Api.mSkuCategoryTree {
id = item.skums_id,
name = item.full_name,
open = false,
children = chidren.Select(a=>new Models.Api.mSkuCategoryTree {
id = a.skums_id,
name = a.full_name,
open = false
}).ToList()
};
list.Add(m);
}
return list;
}
}
}
}
Bailun.DC.Services/WareHouseServices.cs
......@@ -179,7 +179,32 @@ namespace Bailun.DC.Services
var sql = @"select t1.*,t2.category_name,t2.sku_image,t2.sku_title_cn,t2.sku_title_en ";
var sqlwhere = @" from dc_skuwarehouse_stock_sales t1
left join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku where 1=1 ";
join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku ";
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
//sqlwhere += " join dc_base_sku t4 on t1.bailun_sku=t4.bailun_sku ";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
if (!string.IsNullOrEmpty(s))
{
sqlwhere += " and t2.category_id in (" + s + ")";
}
}
}
sqlwhere += " where 1=1 ";
if (!string.IsNullOrWhiteSpace(code))
{
......@@ -225,27 +250,7 @@ namespace Bailun.DC.Services
sqlwhere += " and t1.amount_stock<@stockamountmax";
sqlparam.Add("stockamountmax", stockamountmax.Value);
}
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
if (!string.IsNullOrEmpty(s))
{
sqlwhere += " and t2.category_id in (" + s + ")";
}
}
}
if (push_status.HasValue)
{
sqlwhere += " and t2.push_status="+push_status.Value;
......@@ -638,41 +643,44 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = "select t1.warehouse_code,t1.warehouse_name,sum(t1.usable_stock) usable_stock,sum(t1.usable_stock_amount) usable_stock_amount,sum(t1.quantity_purchase) quantity_purchase,sum(t1.quantity_purchase_amount) quantity_purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.quantity_transfer_amount) quantity_transfer_amount,sum(t1.yd_sales_amount) yd_sales_amount,sum(t1.yd_sales_count) yd_sales_count,sum(t1.yd_sales_stockamount) yd_sales_stockamount,sum(t1.yd_grossprofit) yd_grossprofit,(sum(t1.yd_grossprofit_rate)/count(id)) yd_grossprofit_rate,sum(t1.pre30_sales_amount) pre30_sales_amount,sum(t1.pre30_sales_count) pre30_sales_count,sum(t1.pre30_stockamount) pre30_stockamount,sum(t1.pre30_grossprofit) pre30_grossprofit,(sum(t1.pre30_grossprofit_rate)/count(id)) pre30_grossprofit_rate,t1.pre30_return_rate,(sum(t1.pre30_stockamount_turn_rate)/count(id)) pre30_stockamount_turn_rate,sum(t1.pre30_stockamount_add) pre30_stockamount_add,(sum(t1.pre30_stockamount__rate)/count(id)) pre30_stockamount__rate,(sum(t1.pre30_stocknum_turn_rate)/count(id)) pre30_stocknum_turn_rate,sum(t1.pre30_stock_add_count) pre30_stock_add_count,(sum(t1.pre30_stocknum_rate)/count(id)) pre30_stocknum_rate,(sum(t1.pre30_stockamount_vendibility_day)/count(id)) pre30_stockamount_vendibility_day,(sum(t1.pre30_stocknum_vendibility_day)/count(id)) pre30_stocknum_vendibility_day from dc_mid_sku_profit t1 where 1=1 ";
var sql = "select t1.warehouse_code,t1.warehouse_name,sum(t1.usable_stock) usable_stock,sum(t1.usable_stock_amount) usable_stock_amount,sum(t1.quantity_purchase) quantity_purchase,sum(t1.quantity_purchase_amount) quantity_purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.quantity_transfer_amount) quantity_transfer_amount,sum(t1.yd_sales_amount) yd_sales_amount,sum(t1.yd_sales_count) yd_sales_count,sum(t1.yd_sales_stockamount) yd_sales_stockamount,sum(t1.yd_grossprofit) yd_grossprofit,(sum(t1.yd_grossprofit_rate)/count(t1.id)) yd_grossprofit_rate,sum(t1.pre30_sales_amount) pre30_sales_amount,sum(t1.pre30_sales_count) pre30_sales_count,sum(t1.pre30_stockamount) pre30_stockamount,sum(t1.pre30_grossprofit) pre30_grossprofit,(sum(t1.pre30_grossprofit_rate)/count(t1.id)) pre30_grossprofit_rate,t1.pre30_return_rate,(sum(t1.pre30_stockamount_turn_rate)/count(t1.id)) pre30_stockamount_turn_rate,sum(t1.pre30_stockamount_add) pre30_stockamount_add,(sum(t1.pre30_stockamount__rate)/count(t1.id)) pre30_stockamount__rate,(sum(t1.pre30_stocknum_turn_rate)/count(t1.id)) pre30_stocknum_turn_rate,sum(t1.pre30_stock_add_count) pre30_stock_add_count,(sum(t1.pre30_stocknum_rate)/count(t1.id)) pre30_stocknum_rate,(sum(t1.pre30_stockamount_vendibility_day)/count(t1.id)) pre30_stockamount_vendibility_day,(sum(t1.pre30_stocknum_vendibility_day)/count(t1.id)) pre30_stocknum_vendibility_day from dc_mid_sku_profit t1 ";
if (!string.IsNullOrEmpty(skucategoryids))
{
sql += " join dc_base_sku t4 on t1.bailun_sku=t4.bailun_sku ";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t1.category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
}
sql += " where 1=1 ";
if (!string.IsNullOrEmpty(warehousecode))
{
sql += " and warehouse_code=@warehouse_code";
sql += " and t1.warehouse_code=@warehouse_code";
sqlparam.Add("warehouse_code", warehousecode);
}
sql += " group by warehouse_code";
sql += " group by t1.warehouse_code";
if (!string.IsNullOrEmpty(parameter.sort))
{
sql += " order by " + parameter.sort + " " + parameter.order;
sql += " order by t1." + parameter.sort + " " + parameter.order;
}
var obj = cn.Page<dc_mid_sku_profit>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam, "", 2 * 60);
......@@ -699,33 +707,36 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = "select sum(t1.usable_stock) usable_stock,sum(t1.usable_stock_amount) usable_stock_amount,sum(t1.quantity_purchase) quantity_purchase,sum(t1.quantity_purchase_amount) quantity_purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.quantity_transfer_amount) quantity_transfer_amount,sum(t1.yd_sales_amount) yd_sales_amount,sum(t1.yd_sales_count) yd_sales_count,sum(t1.yd_sales_stockamount) yd_sales_stockamount,sum(t1.yd_grossprofit) yd_grossprofit,(sum(t1.yd_grossprofit_rate)/count(id)) yd_grossprofit_rate,sum(t1.pre30_sales_amount) pre30_sales_amount,sum(t1.pre30_sales_count) pre30_sales_count,sum(t1.pre30_stockamount) pre30_stockamount,sum(t1.pre30_grossprofit) pre30_grossprofit,(sum(t1.pre30_grossprofit_rate)/count(id)) pre30_grossprofit_rate,t1.pre30_return_rate,(sum(t1.pre30_stockamount_turn_rate)/count(id)) pre30_stockamount_turn_rate,sum(t1.pre30_stockamount_add) pre30_stockamount_add,(sum(t1.pre30_stockamount__rate)/count(id)) pre30_stockamount__rate,(sum(t1.pre30_stocknum_turn_rate)/count(id)) pre30_stocknum_turn_rate,sum(t1.pre30_stock_add_count) pre30_stock_add_count,(sum(t1.pre30_stocknum_rate)/count(id)) pre30_stocknum_rate,(sum(t1.pre30_stockamount_vendibility_day)/count(id)) pre30_stockamount_vendibility_day,(sum(t1.pre30_stocknum_vendibility_day)/count(id)) pre30_stocknum_vendibility_day from dc_mid_sku_profit t1 where 1=1 ";
var sql = "select sum(t1.usable_stock) usable_stock,sum(t1.usable_stock_amount) usable_stock_amount,sum(t1.quantity_purchase) quantity_purchase,sum(t1.quantity_purchase_amount) quantity_purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.quantity_transfer_amount) quantity_transfer_amount,sum(t1.yd_sales_amount) yd_sales_amount,sum(t1.yd_sales_count) yd_sales_count,sum(t1.yd_sales_stockamount) yd_sales_stockamount,sum(t1.yd_grossprofit) yd_grossprofit,(sum(t1.yd_grossprofit_rate)/count(t1.id)) yd_grossprofit_rate,sum(t1.pre30_sales_amount) pre30_sales_amount,sum(t1.pre30_sales_count) pre30_sales_count,sum(t1.pre30_stockamount) pre30_stockamount,sum(t1.pre30_grossprofit) pre30_grossprofit,(sum(t1.pre30_grossprofit_rate)/count(t1.id)) pre30_grossprofit_rate,t1.pre30_return_rate,(sum(t1.pre30_stockamount_turn_rate)/count(t1.id)) pre30_stockamount_turn_rate,sum(t1.pre30_stockamount_add) pre30_stockamount_add,(sum(t1.pre30_stockamount__rate)/count(t1.id)) pre30_stockamount__rate,(sum(t1.pre30_stocknum_turn_rate)/count(t1.id)) pre30_stocknum_turn_rate,sum(t1.pre30_stock_add_count) pre30_stock_add_count,(sum(t1.pre30_stocknum_rate)/count(t1.id)) pre30_stocknum_rate,(sum(t1.pre30_stockamount_vendibility_day)/count(t1.id)) pre30_stockamount_vendibility_day,(sum(t1.pre30_stocknum_vendibility_day)/count(t1.id)) pre30_stocknum_vendibility_day from dc_mid_sku_profit t1 ";
if (!string.IsNullOrEmpty(skucategoryids))
{
sql += " join dc_base_sku t4 on t1.bailun_sku=t4.bailun_sku ";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t1.category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
}
sql += " where 1=1 ";
if (!string.IsNullOrEmpty(warehousecode))
{
sql += " and warehouse_code=@warehouse_code";
sql += " and t1.warehouse_code=@warehouse_code";
sqlparam.Add("warehouse_code", warehousecode);
}
......@@ -752,43 +763,46 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = "select t1.warehouse_code,t1.warehouse_name,t1.usable_stock,t1.usable_stock_amount,t1.quantity_purchase,t1.quantity_purchase_amount,t1.quantity_transfer,t1.quantity_transfer_amount,t1.yd_sales_amount,t1.yd_sales_count,t1.yd_sales_stockamount,t1.yd_grossprofit,t1.yd_grossprofit_rate,t1.pre30_sales_amount,t1.pre30_sales_count,t1.pre30_stockamount,t1.pre30_grossprofit,t1.pre30_grossprofit_rate,t1.pre30_return_rate,t1.pre30_stockamount_turn_rate,t1.pre30_stockamount_add,t1.pre30_stockamount__rate,t1.pre30_stocknum_turn_rate,t1.pre30_stock_add_count,t1.pre30_stocknum_rate,t1.pre30_stockamount_vendibility_day,t1.pre30_stocknum_vendibility_day,t1.bailun_sku,t1.category_name from dc_mid_sku_profit t1 where 1=1 ";
var sql = "select t1.warehouse_code,t1.warehouse_name,t1.usable_stock,t1.usable_stock_amount,t1.quantity_purchase,t1.quantity_purchase_amount,t1.quantity_transfer,t1.quantity_transfer_amount,t1.yd_sales_amount,t1.yd_sales_count,t1.yd_sales_stockamount,t1.yd_grossprofit,t1.yd_grossprofit_rate,t1.pre30_sales_amount,t1.pre30_sales_count,t1.pre30_stockamount,t1.pre30_grossprofit,t1.pre30_grossprofit_rate,t1.pre30_return_rate,t1.pre30_stockamount_turn_rate,t1.pre30_stockamount_add,t1.pre30_stockamount__rate,t1.pre30_stocknum_turn_rate,t1.pre30_stock_add_count,t1.pre30_stocknum_rate,t1.pre30_stockamount_vendibility_day,t1.pre30_stocknum_vendibility_day,t1.bailun_sku,t1.category_name from dc_mid_sku_profit t1 ";
if (!string.IsNullOrEmpty(skucategoryids))
{
sql += " join dc_base_sku t4 on t1.bailun_sku=t4.bailun_sku ";
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
//获取选中分类下所有的分类
var AllCategory = Services.CommonServices.GetCategoryList(0);
var listcategory = new List<Models.Common.CategoryDto>();
//var AllCategory = Services.CommonServices.GetCategoryList(0);
//var listcategory = new List<Models.Common.CategoryDto>();
foreach (var item in arr)
{
listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
}
//foreach (var item in arr)
//{
// listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
//}
var s = string.Join(",", listcategory.Select(a => a.C_ID));
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
sql += " and t1.category_id in (" + s + ") ";
sql += " and t4.category_simple_id in (" + s + ") ";
}
}
}
sql += " where 1=1 ";
if (!string.IsNullOrEmpty(warehousecode))
{
sql += " and warehouse_code=@warehouse_code";
sql += " and t1.warehouse_code=@warehouse_code";
sqlparam.Add("warehouse_code", warehousecode);
}
if (!string.IsNullOrEmpty(parameter.sort))
{
sql += " order by " + parameter.sort + " " + parameter.order;
sql += " order by t1." + parameter.sort + " " + parameter.order;
}
else
{
sql += " order by pre30_sales_amount desc";
sql += " order by t1.pre30_sales_amount desc";
}
var obj = cn.Page<dc_mid_sku_profit>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam, "", 2 * 60);
......
Bailun.DC.SkuProfitService/Program.cs
......@@ -7,23 +7,23 @@ namespace Bailun.DC.SkuProfitService
{
class Program
{
static async Task Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//static async Task Main(string[] args)
//{
// Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// services.AddHostedService<Services>();
// });
// var _service = new Services();
// _service.Save();
// await builder.RunConsoleAsync();
//}
static void Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var _service = new Services();
_service.Save();
}
}
}
Bailun.DC.Web/Areas/Reports/Views/Orders/AmazonSaleStatistics.cshtml
......@@ -108,7 +108,8 @@
listWarehouse();
})
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -300,6 +301,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/EbaySaleStatistics.cshtml
......@@ -110,7 +110,9 @@
listwarehouse();
});
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -322,6 +324,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/FBAAbnormalOrder.cshtml
......@@ -86,7 +86,9 @@
listAccount();
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -189,6 +191,24 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/FBASaleStatistics.cshtml
......@@ -95,7 +95,9 @@
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -259,6 +261,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListOrder.cshtml
......@@ -93,7 +93,9 @@
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -232,6 +234,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListPlatformCost.cshtml
......@@ -110,7 +110,8 @@
$('#warehousetype').change(function () {
listwarehouse();
})
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -260,6 +261,24 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformFeeAbnormal.cshtml
......@@ -87,7 +87,8 @@
listAccount();
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -202,6 +203,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformProfitCount.cshtml
......@@ -148,7 +148,9 @@
listPlatform();
listcategory12();
//listcategory12();
listsimplecategory();
$('#platform').change(function () {
listwebsite();
......@@ -347,6 +349,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/StatisticsByWebsite.cshtml
......@@ -111,7 +111,9 @@
listwarehouse();
})
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -315,6 +317,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListSkuProfit.cshtml
......@@ -77,7 +77,9 @@
listwarehouse();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -202,6 +204,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListWarehouseProfit.cshtml
......@@ -74,7 +74,9 @@
listwarehouse();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -195,6 +197,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Controllers/HomeController.cs
......@@ -158,5 +158,24 @@ namespace Bailun.DC.Web.Controllers
}
/// <summary>
/// 获取简单百伦一二级分类
/// </summary>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
public JsonResult ListSimpleCategory()
{
var companyid = HttpContextHelper.Current.User.GetCompanyId().ToInt32();
if (companyid != 1)
{
return Json("{}");
}
var obj = new Services.SkuInfoServices().ListSimpleCategory12(companyid);
return Json(obj);
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment