Skip to content

D
DataCenter_Core2.1_20190520
Commit 166f55d1 by guanzhenshan
Options

逻辑仓库增加30天内调入数

parent 2ae3c4bf
Showing with 40 additions and 13 deletions
Bailun.DC.LogicWareHouse/Services.cs
......@@ -63,14 +63,15 @@ namespace Bailun.DC.LogicWareHouse
while (page == 1 || (resultcount > 0))
{
var strlimit = (((page - 1) * pagesize) + "," + pagesize);
var sql = $@"select t1.bailun_sku,t1.warehouse_code,t4.warehouse_name,t4.hq_type,(t1.usable_stock) usable_stock,(t1.usable_stock*t1.unit_price) amount_stock,(t2.quantity_purchase) quantity_purchase,(t2.quantity_purchase*t1.unit_price) purchase_amount,(t2.quantity_transfer) quantity_transfer,(t2.quantity_transfer*t1.unit_price) amount_transit,(t5.oneday_total_sales) oneday_total_sales,(t5.oneday_total_sales*t1.unit_price) amount_onedaysale,(t5.sevenday_total_sales) sevenday_total_sales,(t5.fourteenday_total_sales) fourteenday_total_sales,(t5.thirtyday_total_sales) thirtyday_total_sales,t6.quantity_transfer as quantity_tuneout_onway,t6.quantity_transfer_inbound as quantity_tuneout_30days
var sql = $@"select t1.bailun_sku,t1.warehouse_code,t4.warehouse_name,t4.hq_type,(t1.usable_stock) usable_stock,(t1.usable_stock*t1.unit_price) amount_stock,(t2.quantity_purchase) quantity_purchase,(t2.quantity_purchase*t1.unit_price) purchase_amount,(t2.quantity_transfer) quantity_transfer,(t2.quantity_transfer*t1.unit_price) amount_transit,(t5.oneday_total_sales) oneday_total_sales,(t5.oneday_total_sales*t1.unit_price) amount_onedaysale,(t5.sevenday_total_sales) sevenday_total_sales,(t5.fourteenday_total_sales) fourteenday_total_sales,(t5.thirtyday_total_sales) thirtyday_total_sales,t6.quantity_transfer as quantity_tuneout_onway,t6.quantity_transfer_inbound as quantity_tuneout_30days,t7.quantity_transfer_inbound as quantity_tunein_30days
from (select t01.bailun_sku,t01.warehouse_code,t01.usable_stock,t02.unit_price from dc_base_stock t01
join dc_base_sku t02 on t01.bailun_sku=t02.bailun_sku and t02.company_id=1 order by t01.id
limit {strlimit}) t1
left join dc_mid_transit t2 on t1.warehouse_code=t2.warehouse_code and t1.bailun_sku=t2.bailun_sku
left join dc_daily_sales t5 on t5.record_date = '{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}' and t1.warehouse_code=t5.warehouse_code and t1.bailun_sku =t5.bailun_sku
join dc_base_warehouse t4 on t1.warehouse_code=t4.warehouse_code
left join dc_daily_transit_from t6 on t1.warehouse_code=t6.warehouse_code and t1.bailun_sku=t6.bailun_sku and t6.record_time='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}'
left join dc_daily_transit_from t6 on t1.warehouse_code=t6.source_warehouse_code and t1.bailun_sku=t6.bailun_sku and t6.record_time='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}'
left join dc_daily_transit_from t7 on t1.warehouse_code=t7.warehouse_code and t1.bailun_sku=t7.bailun_sku and t7.record_time='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}'
";
......@@ -78,10 +79,10 @@ namespace Bailun.DC.LogicWareHouse
resultcount = liststock.AsList().Count;
var str = @"insert dc_skuwarehouse_stock_sales (bailun_sku,warehouse_code,warehouse_name,hq_type,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,oneday_total_sales,amount_onedaysale,sevenday_total_sales,fourteenday_total_sales,thirtyday_total_sales,quantity_tuneout_onway,quantity_tuneout_30days) values ";
var str = @"insert dc_skuwarehouse_stock_sales (bailun_sku,warehouse_code,warehouse_name,hq_type,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,oneday_total_sales,amount_onedaysale,sevenday_total_sales,fourteenday_total_sales,thirtyday_total_sales,quantity_tuneout_onway,quantity_tuneout_30days,quantity_tunein_30days) values ";
foreach (var item in liststock)
{
str += $@"('{item.bailun_sku}','{item.warehouse_code}','{item.warehouse_name}','{item.hq_type}',{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.oneday_total_sales ?? 0)},{item.amount_onedaysale ?? 0},{item.sevenday_total_sales ?? 0},{item.fourteenday_total_sales ?? 0},{item.thirtyday_total_sales ?? 0},{item.quantity_tuneout_onway??0},{item.quantity_tuneout_30days??0}),";
str += $@"('{item.bailun_sku}','{item.warehouse_code}','{item.warehouse_name}','{item.hq_type}',{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.oneday_total_sales ?? 0)},{item.amount_onedaysale ?? 0},{item.sevenday_total_sales ?? 0},{item.fourteenday_total_sales ?? 0},{item.thirtyday_total_sales ?? 0},{item.quantity_tuneout_onway??0},{item.quantity_tuneout_30days??0},{item.quantity_tunein_30days??0}),";
}
if (resultcount > 0)
{
......
Bailun.DC.Models/Stock/mLogicWarehouse.cs
......@@ -90,5 +90,10 @@ namespace Bailun.DC.Models.Stock
/// 30天内调出数量
/// </summary>
public int? quantity_tuneout_30days { get; set; }
/// <summary>
/// 30天内调入数量
/// </summary>
public int? quantity_tunein_30days { get; set; }
}
}
Bailun.DC.Models/Stock/mSkuWarehouse.cs
......@@ -121,5 +121,10 @@ namespace Bailun.DC.Models.Stock
/// </summary>
public int? quantity_tuneout_30days { get; set; }
/// <summary>
/// 30天内调入数量
/// </summary>
public int? quantity_tunein_30days { get; set; }
}
}
Bailun.DC.Models/Warehouse/dc_skuwarehouse_stock_sales.cs
......@@ -48,6 +48,11 @@ namespace Bailun.DC.Models.Warehouse
/// </summary>
public int? quantity_tuneout_30days { get; set; }
/// <summary>
/// 30天内调入数量
/// </summary>
public int? quantity_tunein_30days { get; set; }
public DateTime? createtime { get; set; }
}
......
Bailun.DC.Services/WareHouseServices.cs
......@@ -77,7 +77,7 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sqlwhere = " where 1=1 ";
var sql = @"select t1.hq_type,t1.warehouse_code,t1.warehouse_name,sum(t1.usable_stock) usable_stock,sum(t1.amount_stock) amount_stock,sum(t1.quantity_purchase) quantity_purchase,sum(t1.purchase_amount) purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.amount_transit) amount_transit,sum(t1.oneday_total_sales) oneday_total_sales,sum(t1.amount_onedaysale) amount_onedaysale,sum(t1.sevenday_total_sales) sevenday_total_sales,sum(t1.fourteenday_total_sales) fourteenday_total_sales,sum(t1.thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(t1.quantity_tuneout_30days) quantity_tuneout_30days from dc_skuwarehouse_stock_sales t1 ";
var sql = @"select t1.hq_type,t1.warehouse_code,t1.warehouse_name,sum(t1.usable_stock) usable_stock,sum(t1.amount_stock) amount_stock,sum(t1.quantity_purchase) quantity_purchase,sum(t1.purchase_amount) purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.amount_transit) amount_transit,sum(t1.oneday_total_sales) oneday_total_sales,sum(t1.amount_onedaysale) amount_onedaysale,sum(t1.sevenday_total_sales) sevenday_total_sales,sum(t1.fourteenday_total_sales) fourteenday_total_sales,sum(t1.thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(t1.quantity_tuneout_30days) quantity_tuneout_30days,sum(t1.quantity_tunein_30days) quantity_tunein_30days from dc_skuwarehouse_stock_sales t1 ";
//var sqlcount = "select t1.warehouse_code from dc_skuwarehouse_stock_sales t1 ";
......@@ -135,7 +135,7 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sqlwhere = " where 1=1 ";
var sql = @"select hq_type,warehouse_code,warehouse_name,sum(usable_stock) usable_stock,sum(amount_stock) amount_stock,sum(quantity_purchase) quantity_purchase,sum(purchase_amount) purchase_amount,sum(quantity_transfer) quantity_transfer,sum(amount_transit) amount_transit,sum(oneday_total_sales) oneday_total_sales,sum(amount_onedaysale) amount_onedaysale,sum(sevenday_total_sales) sevenday_total_sales,sum(fourteenday_total_sales) fourteenday_total_sales,sum(thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(t1.quantity_tuneout_30days) quantity_tuneout_30days from dc_skuwarehouse_stock_sales ";
var sql = @"select hq_type,warehouse_code,warehouse_name,sum(usable_stock) usable_stock,sum(amount_stock) amount_stock,sum(quantity_purchase) quantity_purchase,sum(purchase_amount) purchase_amount,sum(quantity_transfer) quantity_transfer,sum(amount_transit) amount_transit,sum(oneday_total_sales) oneday_total_sales,sum(amount_onedaysale) amount_onedaysale,sum(sevenday_total_sales) sevenday_total_sales,sum(fourteenday_total_sales) fourteenday_total_sales,sum(thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(quantity_tuneout_30days) quantity_tuneout_30days,sum(quantity_tunein_30days) quantity_tunein_30days from dc_skuwarehouse_stock_sales ";
//var sqlcount = "select t1.warehouse_code from dc_skuwarehouse_stock_sales t1 ";
......@@ -174,7 +174,7 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sqlwhere = " where 1=1 ";
var sql = @"select sum(usable_stock) usable_stock,sum(amount_stock) amount_stock,sum(quantity_purchase) quantity_purchase,sum(purchase_amount) purchase_amount,sum(quantity_transfer) quantity_transfer,sum(amount_transit) amount_transit,sum(oneday_total_sales) oneday_total_sales,sum(amount_onedaysale) amount_onedaysale,sum(sevenday_total_sales) sevenday_total_sales,sum(fourteenday_total_sales) fourteenday_total_sales,sum(thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(quantity_tuneout_30days) quantity_tuneout_30days from dc_skuwarehouse_stock_sales ";
var sql = @"select sum(usable_stock) usable_stock,sum(amount_stock) amount_stock,sum(quantity_purchase) quantity_purchase,sum(purchase_amount) purchase_amount,sum(quantity_transfer) quantity_transfer,sum(amount_transit) amount_transit,sum(oneday_total_sales) oneday_total_sales,sum(amount_onedaysale) amount_onedaysale,sum(sevenday_total_sales) sevenday_total_sales,sum(fourteenday_total_sales) fourteenday_total_sales,sum(thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(quantity_tuneout_30days) quantity_tuneout_30days,sum(quantity_tunein_30days) quantity_tunein_30days from dc_skuwarehouse_stock_sales ";
if (!string.IsNullOrWhiteSpace(warehousetype))
{
......
Bailun.DC.Web/Areas/Reports/Controllers/WarehouseController.cs
......@@ -80,6 +80,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.warehouse_name,
quantity_tuneout_onway = (p.quantity_tuneout_onway??0).ToString("N0"),
quantity_tuneout_30days = (p.quantity_tuneout_30days??0).ToString("N0"),
quantity_tunein_30days = (p.quantity_tunein_30days??0).ToString("N0"),
});
......@@ -101,6 +102,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
fourteenday_total_sales = (countM.fourteenday_total_sales ?? 0).ToString("N0"),
quantity_tuneout_onway = (countM.quantity_tuneout_onway ?? 0).ToString("N0"),
quantity_tuneout_30days = (countM.quantity_tuneout_30days ?? 0).ToString("N0"),
quantity_tunein_30days = (countM.quantity_tunein_30days ?? 0).ToString("N0"),
},
isexport = (UserAuthorityServices.checkUserExportAuthority("ExportLogicWarehouse", user.GetUid())?1:0)
......@@ -135,13 +137,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.warehouse_code,
p.warehouse_name,
quantity_tuneout_onway = p.quantity_tuneout_onway??0,
quantity_tuneout_30days = p.quantity_tuneout_30days??0
quantity_tuneout_30days = p.quantity_tuneout_30days??0,
quantity_tunein_30days = p.quantity_tunein_30days??0,
});
var colNames = new List<string> {"仓储仓库","库存数量","库存金额", "采购在途数量", "采购在途金额",
"调拨在途数量", "调拨在途金额","待发货数量","缺货数量","调出在途数",
"30天内调出数","昨日总销量","昨日总销售额","七天销量","十四天销量",
"三十天销量"
"30天内调出数","30天内调入数","昨日总销量","昨日总销售额","七天销量",
"十四天销量","三十天销量"
};
var listVal = new List<string>();
......@@ -150,7 +153,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listVal.Add(
item.warehouse_name + "|" + item.usable_stock + "|" + item.amount_stock + "|" + item.quantity_purchase + "|" + item.purchase_amount + "|" +
item.quantity_transfer + "|" + item.amount_transit + "|" + item.noshippingcount + "|" + item.nostockcount + "|" + item.quantity_tuneout_onway+"|"+
item.quantity_tuneout_30days + "|" + item.oneday_total_sales + "|" + item.amount_onedaysale + "|" + item.sevenday_total_sales + "|" + item.fourteenday_total_sales + "|" + item.thirtyday_total_sales
item.quantity_tuneout_30days + "|" + item.quantity_tunein_30days + "|" + item.oneday_total_sales + "|" + item.amount_onedaysale + "|" + item.sevenday_total_sales + "|" +
item.fourteenday_total_sales + "|" + item.thirtyday_total_sales
);
}
......@@ -223,7 +227,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.warehouse_code,
p.warehouse_name,
quantity_tuneout_onway = p.quantity_tuneout_onway??0,
quantity_tuneout_30days = p.quantity_tuneout_30days
quantity_tuneout_30days = p.quantity_tuneout_30days,
quantity_tunein_30days = (p.quantity_tunein_30days??0)
});
return JsonConvert.SerializeObject(new { total = total, rows = list });
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListWareHouseSku.cshtml
......@@ -161,6 +161,9 @@
{
field: 'quantity_tuneout_30days', title: '30天调出数', width: '130', sortable: true
},
{
field: 'quantity_tunein_30days', title: '30天调入数', width: '130', sortable: true, iscount: true
},
{ field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true },
{ field: 'amount_onedaysale', title: '昨日总销售额', width: '130', sortable: true },
{ field: 'sevenday_total_sales', title: '七天销量', width: '100', sortable: true },
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/LogicWarehouse.cshtml
......@@ -104,13 +104,16 @@
{
field: 'quantity_tuneout_30days', title: '30天调出数', width: '130', sortable: true, iscount: true
},
{
field: 'quantity_tunein_30days', title: '30天调入数', width: '130', sortable: true, iscount: true
},
{ field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true, iscount: true },
{ field: 'amount_onedaysale', title: '昨日总销售额', width: '130', sortable: true, iscount: true },
{ field: 'sevenday_total_sales', title: '七天销量', width: '100', sortable: true, iscount: true },
{ field: 'fourteenday_total_sales', title: '十四天销量', width: '120', sortable: true, iscount: true },
{ field: 'thirtyday_total_sales', title: '三十天销量', width: '130', sortable: true, iscount: true }
];
var url = '@Url.Content("~/Reports/Warehouse/LogicWarehouseJson")' + '?' + $("#toolbar").serialize();
if (tb == undefined) {
......
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