Skip to content

D
DataCenter_Core2.1_20190520
Commit 71a5851b by guanzhenshan
Options

库龄增加筛选条件

parent 85c997b0
Showing with 38 additions and 12 deletions
Bailun.DC.Services/InventoryServices.cs
...@@ -1011,7 +1011,7 @@ namespace Bailun.DC.Services ...@@ -1011,7 +1011,7 @@ namespace Bailun.DC.Services
/// <param name="end">结束时间</param> /// <param name="end">结束时间</param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public List<dc_mid_stock_date> ListStockDate(BtTableParameter parameter, string sku, string warehousetype, string warehouse,DateTime? start,DateTime? end,ref int total) public List<dc_mid_stock_date> ListStockDate(BtTableParameter parameter, string sku, string warehousetype, string warehouse,DateTime? start,DateTime? end,string buyername,ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select t1.bailun_sku,t1.warehouse_code,t2.warehouse_name,sum(t1.quantity_stock) as quantity_stock,sum(t1.quantity_stock*t1.unit_price) as amount,stock_time from dc_mid_stock_date t1 "; var sql = "select t1.bailun_sku,t1.warehouse_code,t2.warehouse_name,sum(t1.quantity_stock) as quantity_stock,sum(t1.quantity_stock*t1.unit_price) as amount,stock_time from dc_mid_stock_date t1 ";
...@@ -1023,6 +1023,12 @@ namespace Bailun.DC.Services ...@@ -1023,6 +1023,12 @@ namespace Bailun.DC.Services
sqlparam.Add("warehousetype", warehousetype); sqlparam.Add("warehousetype", warehousetype);
} }
if (!string.IsNullOrEmpty(buyername))
{
sqlwhere += " join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku and t3.buyer_name=@";
sqlparam.Add("buyer_name", buyername);
}
sqlwhere += " where t1.quantity_stock>0 "; sqlwhere += " where t1.quantity_stock>0 ";
if (!string.IsNullOrEmpty(sku)) if (!string.IsNullOrEmpty(sku))
...@@ -1045,6 +1051,7 @@ namespace Bailun.DC.Services ...@@ -1045,6 +1051,7 @@ namespace Bailun.DC.Services
sqlwhere += " and t1.stock_time<@end"; sqlwhere += " and t1.stock_time<@end";
sqlparam.Add("end", end.Value.AddDays(1)); sqlparam.Add("end", end.Value.AddDays(1));
} }
sqlwhere += " group by t1.bailun_sku,t1.warehouse_code,stock_time"; sqlwhere += " group by t1.bailun_sku,t1.warehouse_code,stock_time";
...@@ -1084,7 +1091,7 @@ namespace Bailun.DC.Services ...@@ -1084,7 +1091,7 @@ namespace Bailun.DC.Services
/// <param name="start">开始时间</param> /// <param name="start">开始时间</param>
/// <param name="end">结束时间</param> /// <param name="end">结束时间</param>
/// <returns></returns> /// <returns></returns>
public dc_mid_stock_date ListStockDateCount(string sku, string warehousetype, string warehouse, DateTime? start, DateTime? end) public dc_mid_stock_date ListStockDateCount(string sku, string warehousetype, string warehouse, DateTime? start, DateTime? end,string buyername)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select sum(t1.quantity_stock) as quantity_stock,sum(t1.quantity_stock*t1.unit_price) as amount from dc_mid_stock_date t1 "; var sql = "select sum(t1.quantity_stock) as quantity_stock,sum(t1.quantity_stock*t1.unit_price) as amount from dc_mid_stock_date t1 ";
...@@ -1097,6 +1104,12 @@ namespace Bailun.DC.Services ...@@ -1097,6 +1104,12 @@ namespace Bailun.DC.Services
sqlparam.Add("warehousetype", warehousetype); sqlparam.Add("warehousetype", warehousetype);
} }
if (!string.IsNullOrEmpty(buyername))
{
sqlwhere += " join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku and t3.buyer_name=@";
sqlparam.Add("buyer_name", buyername);
}
sqlwhere += " where t1.quantity_stock>0 "; sqlwhere += " where t1.quantity_stock>0 ";
if (!string.IsNullOrEmpty(sku)) if (!string.IsNullOrEmpty(sku))
......
Bailun.DC.Web/Areas/Reports/Controllers/SkuController.cs
...@@ -173,7 +173,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -173,7 +173,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="type">库龄，3：3个月以上，6：6个月以上，12：1年以上，24：2年以上，36：3年以上，4：3个月以上，6个月以下，7：6个月以上，12个月以下，13：12个月以上，24个月以下，25：24个月以上，36个月以下</param> /// <param name="type">库龄，3：3个月以上，6：6个月以上，12：1年以上，24：2年以上，36：3年以上，4：3个月以上，6个月以下，7：6个月以上，12个月以下，13：12个月以上，24个月以下，25：24个月以上，36个月以下</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)] [BailunAuthentication(LoginMode.Enforce)]
public string ListInventoryAgingJson(BtTableParameter parameter, string sku, string warehouse,string warehousetype, int type) public string ListInventoryAgingJson(BtTableParameter parameter, string sku, string warehouse,string warehousetype, int type,string buyername)
{ {
var total = 0; var total = 0;
...@@ -182,6 +182,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -182,6 +182,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
switch (type) switch (type)
{ {
case 0: //1个月以下的
start = DateTime.Now.AddMonths(-1);
break;
case -3: //0-3个月的
start = DateTime.Now.AddMonths(-3);
break;
case 1: //1个月以上 case 1: //1个月以上
end = end.AddMonths(-type); end = end.AddMonths(-type);
break; break;
...@@ -215,8 +221,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -215,8 +221,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
} }
var _service = new Services.InventoryServices(); var _service = new Services.InventoryServices();
var obj = _service.ListStockDate(parameter, sku,warehousetype,warehouse, start, end, ref total); var obj = _service.ListStockDate(parameter, sku,warehousetype,warehouse, start, end,buyername, ref total);
var objCount = _service.ListStockDateCount(sku, warehousetype, warehouse, start, end); var objCount = _service.ListStockDateCount(sku, warehousetype, warehouse, start, end,buyername);
var list = obj.Select(a => new { var list = obj.Select(a => new {
a.bailun_sku, a.bailun_sku,
...@@ -247,7 +253,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -247,7 +253,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehouse">仓库编码</param> /// <param name="warehouse">仓库编码</param>
/// <param name="type">库龄，3：3个月以上，6：6个月以上，12：1年以上，24：2年以上，36：3年以上，4：3个月以上，6个月以下，7：6个月以上，12个月以下，13：12个月以上，24个月以下，25：24个月以上，36个月以下</param> /// <param name="type">库龄，3：3个月以上，6：6个月以上，12：1年以上，24：2年以上，36：3年以上，4：3个月以上，6个月以下，7：6个月以上，12个月以下，13：12个月以上，24个月以下，25：24个月以上，36个月以下</param>
/// <returns></returns> /// <returns></returns>
public ActionResult ExportInventoryAging(string sku,string warehousetype, string warehouse, int type) public ActionResult ExportInventoryAging(string sku,string warehousetype, string warehouse, int type,string buyername)
{ {
var typename = ""; var typename = "";
var total = 0; var total = 0;
...@@ -256,6 +262,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -256,6 +262,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
switch (type) switch (type)
{ {
case 0: //1个月以下的
start = DateTime.Now.AddMonths(-1);
break;
case -3: //0-3个月的
start = DateTime.Now.AddMonths(-3);
break;
case 1: //1个月以上 case 1: //1个月以上
end = end.AddMonths(-type); end = end.AddMonths(-type);
break; break;
...@@ -268,33 +280,28 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -268,33 +280,28 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
case 12: case 12:
case 24: case 24:
case 36: case 36:
typename = type + "个月以上的";
end = end.AddMonths(-type); end = end.AddMonths(-type);
break; break;
case 4: case 4:
typename = "3至6个月的";
start = DateTime.Now.AddMonths(-6); start = DateTime.Now.AddMonths(-6);
end = DateTime.Now.AddMonths(-3); end = DateTime.Now.AddMonths(-3);
break; break;
case 7: case 7:
typename = "6至12个月的";
start = DateTime.Now.AddMonths(-12); start = DateTime.Now.AddMonths(-12);
end = DateTime.Now.AddMonths(-6); end = DateTime.Now.AddMonths(-6);
break; break;
case 13: case 13:
typename = "12至24个月的";
start = DateTime.Now.AddMonths(-24); start = DateTime.Now.AddMonths(-24);
end = DateTime.Now.AddMonths(-12); end = DateTime.Now.AddMonths(-12);
break; break;
case 25: case 25:
typename = "24至36个月的";
start = DateTime.Now.AddMonths(-36); start = DateTime.Now.AddMonths(-36);
end = DateTime.Now.AddMonths(-24); end = DateTime.Now.AddMonths(-24);
break; break;
} }
var _service = new Services.InventoryServices(); var _service = new Services.InventoryServices();
var obj = _service.ListStockDate(new BtTableParameter { limit=0}, sku, warehousetype, warehouse, start, end, ref total); var obj = _service.ListStockDate(new BtTableParameter { limit=0}, sku, warehousetype, warehouse, start, end, buyername, ref total);
var colNames = new List<string> {"sku","仓库编码","仓库名称", "库存数量", "库存金额","库龄(天)"}; var colNames = new List<string> {"sku","仓库编码","仓库名称", "库存数量", "库存金额","库龄(天)"};
......
Bailun.DC.Web/Areas/Reports/Views/Sku/ListInventoryAging.cshtml
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
<div class="form-group"> <div class="form-group">
<label>库龄类型：</label> <label>库龄类型：</label>
<select id="type" name="type" class="form-control"> <select id="type" name="type" class="form-control">
<option value="0">1个月以下</option>
<option value="1">1个月以上</option> <option value="1">1个月以上</option>
<option value="2">1-3个月</option> <option value="2">1-3个月</option>
<option value="-3">0-3个月</option>
<option value="3">3个月以上</option> <option value="3">3个月以上</option>
<option value="4">3至6个月的</option> <option value="4">3至6个月的</option>
<option value="6">6个月以上</option> <option value="6">6个月以上</option>
...@@ -46,6 +48,10 @@ ...@@ -46,6 +48,10 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>采购员名称：</label>
<input id="buyername" name="buyername" class="form-control" style="width:120px"/>
</div>
<div class="form-group">
<label>&nbsp;</label> <label>&nbsp;</label>
<input id="sku" name="sku" class="form-control" style="width:150px" placeholder="Sku编码" /> <input id="sku" name="sku" class="form-control" style="width:150px" placeholder="Sku编码" />
</div> </div>
......
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