Skip to content

D
DataCenter_Core2.1_20190520
Commit 9987db45 by guanzhenshan
Options

每日销进比报表发货出库增加调拨出库的统计

parent 3afa0d2c
Showing with 42 additions and 1 deletion
Bailun.DC.SkuDailyPurchaseAndSales/Services.cs
...@@ -96,6 +96,16 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales ...@@ -96,6 +96,16 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
group by tb.bailun_sku,tb.warehouse_code"; group by tb.bailun_sku,tb.warehouse_code";
var objShipping = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList(); var objShipping = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();
//调拨出库
sql = $@"select t1.warehouse_code,t3.warehouse_name,t1.bailun_sku,t1.count,t1.count*t2.unit_price from dc_base_transfer_complete t1
left join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku
left join dc_base_warehouse t3 on t1.warehouse_code = t3.warehouse_code
where t1.create_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.deleted = 0
group by t1.bailun_sku,t1.warehouse_code";
var objAllot = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();
objShipping.AddRange(objAllot);
var listSkuWarehouse = objPurchase.Select(a => new { var listSkuWarehouse = objPurchase.Select(a => new {
a.bailun_sku, a.bailun_sku,
a.warehouse_code, a.warehouse_code,
...@@ -121,6 +131,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales ...@@ -121,6 +131,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
a.warehouse_name a.warehouse_name
}).ToList()); }).ToList());
listSkuWarehouse = listSkuWarehouse.Distinct().ToList(); listSkuWarehouse = listSkuWarehouse.Distinct().ToList();
var tempList = new List<SkuWarehouse>(); var tempList = new List<SkuWarehouse>();
......
Bailun.DC.Web/Areas/Reports/Controllers/WarehouseController.cs
...@@ -219,6 +219,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -219,6 +219,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns> /// <returns></returns>
public ActionResult WarehouseRedundancy() public ActionResult WarehouseRedundancy()
{ {
return View(); return View();
} }
......
Bailun.DC.Web/Controllers/HomeController.cs
...@@ -49,7 +49,10 @@ namespace Bailun.DC.Web.Controllers ...@@ -49,7 +49,10 @@ namespace Bailun.DC.Web.Controllers
ViewBag.username = username; ViewBag.username = username;
ViewBag.departmentname = departmentname; ViewBag.departmentname = departmentname;
HttpContext.Response.Cookies.Append("companyid", companyid+""); HttpContext.Response.Cookies.Append("companyid", companyid+"",new Microsoft.AspNetCore.Http.CookieOptions {
Expires = DateTime.Now.AddDays(1)
});
var listMenu = new Services.MenuServices().ListMenu(username); var listMenu = new Services.MenuServices().ListMenu(username);
ViewBag.menus = listMenu; ViewBag.menus = listMenu;
...@@ -57,6 +60,15 @@ namespace Bailun.DC.Web.Controllers ...@@ -57,6 +60,15 @@ namespace Bailun.DC.Web.Controllers
return View(); return View();
} }
/// <summary>
/// 无权访问提示页面
/// </summary>
/// <returns></returns>
public ActionResult NoPermission()
{
return View();
}
[HttpPost] [HttpPost]
public JsonResult ListWarehouseType() public JsonResult ListWarehouseType()
{ {
......
Bailun.DC.Web/Views/Home/NoPermission.cshtml 0 → 100644

@{
Layout = null;
}
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width" />
<title>无权访问</title>
</head>
<body style="text-align:center;padding:0px;margin:0px;">
<h3 style="margin-top:60px;text-align:center;">您访问的页面没有权限。</h3>
</body>
</html>
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