Commit 7390b265 by lizefeng

优化jit规则日志显示

parent e2558c57
...@@ -51,6 +51,11 @@ namespace AutoTurnOver.DB ...@@ -51,6 +51,11 @@ namespace AutoTurnOver.DB
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
if (data!=null) if (data!=null)
{ {
if (data.tag_id > 0)
{
sql += " and t1.tag_id = @tag_id ";
parameters.Add("tag_id", data.tag_id);
}
if (!string.IsNullOrWhiteSpace(data.bailun_sku)) if (!string.IsNullOrWhiteSpace(data.bailun_sku))
{ {
sql += " and t1.bailun_sku = @bailun_sku "; sql += " and t1.bailun_sku = @bailun_sku ";
...@@ -81,6 +86,11 @@ namespace AutoTurnOver.DB ...@@ -81,6 +86,11 @@ namespace AutoTurnOver.DB
} }
} }
public static List<dc_auto_jit_tag> All()
{
return _connection.Query<dc_auto_jit_tag>(" selct * fom dc_auto_jit_tag ").AsList();
}
/// <summary> /// <summary>
/// 保存安全库存规则 /// 保存安全库存规则
/// </summary> /// </summary>
......
...@@ -102,6 +102,8 @@ namespace AutoTurnOver.Models ...@@ -102,6 +102,8 @@ namespace AutoTurnOver.Models
public DateTime? e_date { get; set; } public DateTime? e_date { get; set; }
public string bailun_sku { get; set; } public string bailun_sku { get; set; }
public int? tag_id { get; set; }
} }
} }
...@@ -26,7 +26,12 @@ namespace AutoTurnOver.Services ...@@ -26,7 +26,12 @@ namespace AutoTurnOver.Services
{ {
return DB.dc_auto_jit_tag_dao.JitTagLogList(data,offset, limit, ref total); return DB.dc_auto_jit_tag_dao.JitTagLogList(data,offset, limit, ref total);
} }
public List<dc_auto_jit_tag> All()
{
return DB.dc_auto_jit_tag_dao.All();
}
public string SaveJitTag(dc_auto_jit_tag m, string username) public string SaveJitTag(dc_auto_jit_tag m, string username)
{ {
......
...@@ -28,14 +28,15 @@ namespace AutoTurnOver.Controllers ...@@ -28,14 +28,15 @@ namespace AutoTurnOver.Controllers
}); });
} }
public JsonResult JitTagLogList(int limit, int offset, string order, string sort,string bailun_sku,DateTime? b_date,DateTime? e_date) public JsonResult JitTagLogList(int limit, int offset, string order, string sort,string bailun_sku,DateTime? b_date,DateTime? e_date,int? tag_id = null)
{ {
var total = 0; var total = 0;
var service = new Services.JitTagServices(); var service = new Services.JitTagServices();
var list = service.JitTagLogList(new dc_auto_jit_tag_log_search_dto { var list = service.JitTagLogList(new dc_auto_jit_tag_log_search_dto {
bailun_sku =bailun_sku, bailun_sku =bailun_sku,
b_date =b_date, b_date =b_date,
e_date = e_date e_date = e_date,
tag_id = tag_id
} ,offset, limit, ref total); } ,offset, limit, ref total);
return new JsonResult(new return new JsonResult(new
...@@ -45,7 +46,12 @@ namespace AutoTurnOver.Controllers ...@@ -45,7 +46,12 @@ namespace AutoTurnOver.Controllers
}); });
} }
public List<dc_auto_jit_tag> All()
{
return new Services.JitTagServices().All();
}
[HttpPost] [HttpPost]
......
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