Commit c0e4644e by 泽锋 李

永久停止的sku,清理采购建议

parent 5dcb0cf5
...@@ -574,7 +574,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -574,7 +574,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, UserData user) public static string BatchMonitorStatus(string ids, int monitor_status, int time_type, UserData user)
{ {
var conn = _connection; var conn = _connection;
if (monitor_status != 1 && monitor_status != 0) if (monitor_status != 1 && monitor_status != 0)
...@@ -595,7 +595,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -595,7 +595,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
} }
if (oldData != null && oldData.status == 1) if (oldData != null && oldData.status == 1 && oldData.time_type == time_type)
{ {
if (monitor_status == 1) if (monitor_status == 1)
{ {
...@@ -617,22 +617,24 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -617,22 +617,24 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
bl_operator = user.UserName, bl_operator = user.UserName,
sku_title = "", sku_title = "",
warehouse_name = "", warehouse_name = "",
gmt_modified = now gmt_modified = now,
time_type = time_type
}; };
conn.Insert<dc_auto_config_sku_warehouse>(newData); conn.Insert<dc_auto_config_sku_warehouse>(newData);
} }
else else
{ {
conn.Execute(" update dc_auto_config_sku_warehouse set status=@monitor_status,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName }); conn.Execute(" update dc_auto_config_sku_warehouse set status=@monitor_status,time_type=@time_type,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName, time_type= time_type });
} }
conn.Insert(new dc_base_monitor_status_log { conn.Insert(new dc_base_monitor_status_log
bailun_sku = turnover_item.bailun_sku, {
warehouse_code = turnover_item.warehouse_code, bailun_sku = turnover_item.bailun_sku,
date =DateTime.Now, warehouse_code = turnover_item.warehouse_code,
monitor_status = monitor_status.ToString(), date = DateTime.Now,
user_name = user.UserName monitor_status = monitor_status.ToString(),
user_name = user.UserName
}); });
} }
...@@ -657,7 +659,15 @@ GROUP BY t1.bailun_sku,t3.hq_type ...@@ -657,7 +659,15 @@ GROUP BY t1.bailun_sku,t3.hq_type
);", new );", new
{ {
bailun_skus = datas.Select(s => s.bailun_sku).ToList() bailun_skus = datas.Select(s => s.bailun_sku).ToList()
}); ; });
// 如果是永久停止,则清理历史采购建议
if (time_type == 2)
{
_connection.Execute(" update dc_auto_purchase_advise_detailed set `status`=-1 where bailun_sku_warehouse_codes in @bailun_sku_warehouse_codes ",new {
bailun_sku_warehouse_codes = datas.Select(s => $"{s.bailun_sku}{s.warehouse_code}").ToList()
});
}
return ""; return "";
...@@ -1764,7 +1774,7 @@ and start_date<=@end_date and end_date>=@start_date ...@@ -1764,7 +1774,7 @@ and start_date<=@end_date and end_date>=@start_date
return ex.Message; return ex.Message;
} }
} }
public static string SaveSalesDayConfig(sales_day_config_input_dto m, UserData user,bool is_reset_data = true) public static string SaveSalesDayConfig(sales_day_config_input_dto m, UserData user, bool is_reset_data = true)
{ {
try try
...@@ -1801,12 +1811,13 @@ and start_date<=@end_date and end_date>=@start_date ...@@ -1801,12 +1811,13 @@ and start_date<=@end_date and end_date>=@start_date
if (is_reset_data) if (is_reset_data)
{ {
_connection.Insert(new dc_base_queue { _connection.Insert(new dc_base_queue
{
submit_date = DateTime.Now, submit_date = DateTime.Now,
error_message ="", error_message = "",
consume_date = null, consume_date = null,
error_stack_trace ="", error_stack_trace = "",
message = new { bailun_sku= data.bailun_sku, warehouse_code= data.warehouse_code }.ToJson(), message = new { bailun_sku = data.bailun_sku, warehouse_code = data.warehouse_code }.ToJson(),
type = "刷新周转表", type = "刷新周转表",
remarks = "配置预测销量" remarks = "配置预测销量"
}); });
......
...@@ -922,10 +922,6 @@ from dc_auto_turnover as dat ...@@ -922,10 +922,6 @@ from dc_auto_turnover as dat
} }
} }
/// <summary> /// <summary>
/// 获取特殊销售设置详情 /// 获取特殊销售设置详情
/// </summary> /// </summary>
...@@ -936,9 +932,6 @@ from dc_auto_turnover as dat ...@@ -936,9 +932,6 @@ from dc_auto_turnover as dat
return _connection.QueryFirstOrDefault<dc_auto_config_correction>("select * from dc_auto_config_correction where id=" + id); return _connection.QueryFirstOrDefault<dc_auto_config_correction>("select * from dc_auto_config_correction where id=" + id);
} }
#endregion #endregion
/// <summary> /// <summary>
......
...@@ -23,5 +23,10 @@ namespace AutoTurnOver.Models ...@@ -23,5 +23,10 @@ namespace AutoTurnOver.Models
public int status { get; set; } public int status { get; set; }
public string bl_operator { get; set; } public string bl_operator { get; set; }
/// <summary>
/// 1= 暂时停止 2 = 永久停止
/// </summary>
public int? time_type { get; set; }
} }
} }
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