Commit 6c3f28a0 by zhoujinhui

监控操作新增说明

parent 115aa7f2
...@@ -575,7 +575,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -575,7 +575,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
/// <param name="monitor_status"></param> /// <param name="monitor_status"></param>
/// <param name="user"></param> /// <param name="user"></param>
/// <returns></returns> /// <returns></returns>
public static string BatchMonitorStatus(string ids, int monitor_status, int time_type, UserData user) public static string BatchMonitorStatus(string ids, int monitor_status, int time_type, UserData user, string explain)
{ {
var conn = _connection; var conn = _connection;
if (monitor_status != 1 && monitor_status != 0) if (monitor_status != 1 && monitor_status != 0)
...@@ -640,7 +640,8 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -640,7 +640,8 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
date = DateTime.Now, date = DateTime.Now,
monitor_status = monitor_status.ToString(), monitor_status = monitor_status.ToString(),
user_name = user.UserName, user_name = user.UserName,
time_type = time_type time_type = time_type,
explain = explain
}); });
} }
...@@ -2423,7 +2424,7 @@ where 1 = 1 "; ...@@ -2423,7 +2424,7 @@ where 1 = 1 ";
search.rows = search.limit; search.rows = search.limit;
sqlText.Append(@" sqlText.Append(@"
select t1.user_name,CASE WHEN t1.monitor_status=0 THEN '开启监控' ELSE '停止监控' END monitor_status, select t1.user_name,CASE WHEN t1.monitor_status=0 THEN '开启监控' ELSE '停止监控' END monitor_status,
DATE_FORMAT(t1.date,'%Y-%m-%d %H:%i::%s') create_time,t1.bailun_sku,t2.sku_title_cn, DATE_FORMAT(t1.date,'%Y-%m-%d %H:%i::%s') create_time,t1.bailun_sku,t2.sku_title_cn, t1.explain,
t1.warehouse_code,t3.warehouse_name,CASE WHEN t1.time_type =1 THEN '临时停止' WHEN t1.time_type = 2 THEN '永久停止' ELSE '' END time_type_str t1.warehouse_code,t3.warehouse_name,CASE WHEN t1.time_type =1 THEN '临时停止' WHEN t1.time_type = 2 THEN '永久停止' ELSE '' END time_type_str
from dc_base_monitor_status_log AS t1 from dc_base_monitor_status_log AS t1
LEFT JOIN dc_base_sku AS t2 ON t2.bailun_sku = t1.bailun_sku LEFT JOIN dc_base_sku AS t2 ON t2.bailun_sku = t1.bailun_sku
......
...@@ -17,5 +17,10 @@ namespace AutoTurnOver.Models ...@@ -17,5 +17,10 @@ namespace AutoTurnOver.Models
/// ///
/// </summary> /// </summary>
public int? time_type { get; set; } public int? time_type { get; set; }
/// <summary>
/// 监控状态修改说明
/// </summary>
public string explain { get; set; }
} }
} }
...@@ -417,11 +417,11 @@ namespace AutoTurnOver.Services ...@@ -417,11 +417,11 @@ namespace AutoTurnOver.Services
return DB.db_config.MonitorStatus(bailun_sku, warehouse_code, monitor_status, user); return DB.db_config.MonitorStatus(bailun_sku, warehouse_code, monitor_status, user);
} }
public string BatchMonitorStatus(string ids, int monitor_status, int time_type, UserData user) public string BatchMonitorStatus(string ids, int monitor_status, int time_type, UserData user, string explain)
{ {
try try
{ {
return DB.db_config.BatchMonitorStatus(ids, monitor_status, time_type, user); return DB.db_config.BatchMonitorStatus(ids, monitor_status, time_type, user, explain);
} }
catch (Exception ex) catch (Exception ex)
{ {
......
...@@ -305,11 +305,11 @@ namespace AutoTurnOver.Controllers ...@@ -305,11 +305,11 @@ namespace AutoTurnOver.Controllers
[HttpGet] [HttpGet]
[UseAction] [UseAction]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动下单管理】->【自动周转列表】->【开启/停止监控】操作",3)] [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动下单管理】->【自动周转列表】->【开启/停止监控】操作",3)]
public JsonResult BatchMonitorStatus(string ids, int monitor_status, int time_type) public JsonResult BatchMonitorStatus(string ids, int monitor_status, int time_type, string explain)
{ {
var user = AutoUtility.GetUser(); var user = AutoUtility.GetUser();
if (user == null) return null; if (user == null) return null;
var result = new Services.ConfigServices().BatchMonitorStatus(ids, monitor_status, time_type, user); var result = new Services.ConfigServices().BatchMonitorStatus(ids, monitor_status, time_type, user, explain);
return new JsonResult(result); return new JsonResult(result);
} }
......
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