Skip to content

D
DataCenter_Core2.1_20190520
Commit 23c5eebf by guanzhenshan
Options

处理数据仓的sku分类，改为百伦简单分类

parent 7a5b7a7f
Showing with 66 additions and 56 deletions
Bailun.DC.Services/SkuMonitorServices.cs
......@@ -227,7 +227,23 @@ namespace Bailun.DC.Services
public List<dc_datawarehouse> List2(BtTableParameter parameter, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname, ref int total)
{
var sqlparams = new DynamicParameters();
var sql = "select t1.* from dc_datawarehouse t1 where 1=1 ";
var sql = "select t1.* from dc_datawarehouse t1 ";
sql += " where 1=1 ";
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
//sql += " and t4.bailun_category_id in (" + s + ") ";
sql += " and t1.category_simple_id in (" + s + ") ";
}
}
}
if (!string.IsNullOrWhiteSpace(searchkey))
{
......@@ -299,27 +315,7 @@ namespace Bailun.DC.Services
sql += " and t1.category_id=@categoryid";
sqlparams.Add("categoryid", skucategory.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))
{
sql += " and t1.category_id in (" + s + ")";
}
}
}
if (!string.IsNullOrEmpty(groupname))
{
......@@ -367,8 +363,23 @@ namespace Bailun.DC.Services
{
var sqlparams = new DynamicParameters();
var sql = @"select sum(t1.usable_stock) usable_stock,sum(t1.usable_stock*t3.unit_price) amount_stock,sum(t6.quantity_purchase) quantity_purchase,sum(t6.quantity_purchase*t3.unit_price) as purchase_amount,sum(t6.quantity_transfer) quantity_transfer,sum(t6.quantity_transfer*t3.unit_price) amount_transit,sum(t6.quantity_out_stock) quantity_out_stock,sum(t7.oneday_total_sales) oneday_total_sales,sum(t7.oneday_total_sales*t3.unit_price) as amount_onedaysale,sum(t7.sevenday_total_sales) sevenday_total_sales,sum(t7.sevenday_total_sales*t3.unit_price) amount_sevendaysale,sum(t7.fourteenday_total_sales) fourteenday_total_sales,sum(t7.thirtyday_total_sales) thirtyday_total_sales,sum(t7.sevenday_average_sales) sevenday_average_sales,sum(t7.fourteenday_average_sales) fourteenday_average_sales,sum(t7.thirtyday_average_sales) thirtyday_average_sales from dc_base_stock t1 left join dc_base_warehouse t2 on t1.warehouse_code=t2.warehouse_code left join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku left join dc_auto_config_sku_warehouse t4 on t4.bailun_sku=t1.bailun_sku and t4.warehouse_code=t1.warehouse_code left join dc_sku_monitor t5 on t5.sku=t1.bailun_sku and t5.warehousecode=t1.warehouse_code left join dc_mid_transit t6 on t1.bailun_sku=t6.bailun_sku and t1.warehouse_code=t6.warehouse_code left join dc_daily_sales t7 on t7.record_date = DATE_SUB(curdate(),INTERVAL 1 DAY) and t1.bailun_sku=t7.bailun_sku and t7.warehouse_code=t1.warehouse_code where 1=1 ";
var sql = @"select sum(t1.usable_stock) usable_stock,sum(t1.amount_stock) amount_stock,sum(t1.quantity_purchase) quantity_purchase,sum(t1.purchase_amount) as purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.amount_transit) amount_transit,sum(t1.quantity_out_stock) quantity_out_stock,sum(t1.oneday_total_sales) oneday_total_sales,sum(t1.amount_onedaysale) as amount_onedaysale,sum(t1.sevenday_total_sales) sevenday_total_sales,sum(t1.amount_sevendaysale) amount_sevendaysale,sum(t1.fourteenday_total_sales) fourteenday_total_sales,sum(t1.thirtyday_total_sales) thirtyday_total_sales,sum(t1.sevenday_average_sales) sevenday_average_sales,sum(t1.fourteenday_average_sales) fourteenday_average_sales,sum(t1.thirtyday_average_sales) thirtyday_average_sales from dc_datawarehouse t1 where 1=1 ";
sql += " where 1=1 ";
if (!string.IsNullOrWhiteSpace(skucategoryids))
{
var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
if (arr.Count > 0)
{
var s = string.Join(",", arr);
if (!string.IsNullOrEmpty(s))
{
//sql += " and t4.bailun_category_id in (" + s + ") ";
sql += " and t1.category_simple_id in (" + s + ") ";
}
}
}
if (!string.IsNullOrWhiteSpace(searchkey))
{
......@@ -383,42 +394,42 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(warehousetype))
{
sql += " and t2.hq_type=@hq_type";
sql += " and t1.hq_type=@hq_type";
sqlparams.Add("hq_type", warehousetype);
}
if (!string.IsNullOrWhiteSpace(warehousecode))
{
sql += " and t2.warehouse_code=@warehousecode";
sql += " and t1.warehouse_code=@warehousecode";
sqlparams.Add("warehousecode", warehousecode);
}
if (start.HasValue)
{
sql += " and t3.create_time>=@start";
sql += " and t1.create_time>=@start";
sqlparams.Add("start", start.Value);
}
if (end.HasValue)
{
sql += " and t3.create_time<@end";
sql += " and t1.create_time<@end";
sqlparams.Add("end", end.Value);
}
if (monitorstatus.HasValue)
{
sql += " and t4.status=@monitorstatus";
sql += " and t1.status=@monitorstatus";
sqlparams.Add("monitorstatus", monitorstatus.Value);
}
if (cleanstatus.HasValue)
{
sql += " and t5.clearancestatus=@clearancestatus";
sql += " and t1.clearancestatus=@clearancestatus";
sqlparams.Add("clearancestatus", cleanstatus.Value);
}
if (infringestatus.HasValue)
{
sql += " and t5.tortstatus=@tortstatus";
sql += " and t1.tortstatus=@tortstatus";
sqlparams.Add("tortstatus", infringestatus.Value);
}
if (!string.IsNullOrWhiteSpace(skutip))
{
sql += " and t5.str_skutag like @skutip";
sql += " and t1.str_skutag like @skutip";
sqlparams.Add("skutip", "%" + skutip + "%");
}
if (storestart.HasValue && storestart.Value > 0)
......@@ -433,37 +444,17 @@ namespace Bailun.DC.Services
}
if (skucategory.HasValue)
{
sql += " and t3.category_id=@categoryid";
sql += " and t1.category_id=@categoryid";
sqlparams.Add("categoryid", skucategory.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))
{
sql += " and t3.category_id in (" + s + ")";
}
}
}
if (areaid.HasValue)
{
sql += " and t2.area_id=" + areaid.Value;
sql += " and t1.area_id=" + areaid.Value;
}
if (!string.IsNullOrEmpty(groupname))
{
sql += " and t5.groupname=@groupname";
sql += " and t1.groupname=@groupname";
sqlparams.Add("groupname", groupname);
}
......
Bailun.DC.SkuDataWareHouse/Services.cs
......@@ -63,7 +63,7 @@ namespace Bailun.DC.SkuDataWareHouse
{
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.category_name,t1.sku_title_cn as skuname,(case when t4.status=1 then 0 else 1 end) monitorstatus,t5.clearancestatus,t5.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
from (select t01.bailun_sku,t01.warehouse_code,t01.usable_stock,t02.unit_price,t02.create_time,t02.category_id,t02.category_name,t02.sku_title_cn from dc_base_stock t01
from (select t01.bailun_sku,t01.warehouse_code,t01.usable_stock,t02.unit_price,t02.create_time,t02.category_simple_id as category_id,t02.category_simple_name as category_name,t02.sku_title_cn from dc_base_stock t01
join dc_base_sku t02 on t01.bailun_sku=t02.bailun_sku and t02.company_id=1
limit {strlimit}) t1
left join dc_base_warehouse t2 on t1.warehouse_code=t2.warehouse_code
......
Bailun.DC.Web/Areas/Reports/Views/Inventory/DataWareHouse.cshtml
......@@ -183,7 +183,9 @@
listwarehouse();
})
listcategory12();
//listcategory12();
listsimplecategory();
listarea();
......@@ -417,6 +419,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 selectall(data) {
var ischeck = $(data).is(":checked");
$('.chkitem').each(function () {
......
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