Commit c722a891 by 泽锋 李

采购建议支持软删除

parent d98f81a4
...@@ -9,6 +9,7 @@ using AutoTurnOver.Models.Base; ...@@ -9,6 +9,7 @@ using AutoTurnOver.Models.Base;
using AutoTurnOver.DB.Base; using AutoTurnOver.DB.Base;
using AutoTurnOver.Models.stock; using AutoTurnOver.Models.stock;
using AutoTurnOver.Utility; using AutoTurnOver.Utility;
using AutoTurnOver.Models.Report;
namespace AutoTurnOver.DB namespace AutoTurnOver.DB
{ {
...@@ -1054,6 +1055,83 @@ from dc_auto_turnover where gmt_modified>=@btime and gmt_modified<=@etime ...@@ -1054,6 +1055,83 @@ from dc_auto_turnover where gmt_modified>=@btime and gmt_modified<=@etime
total = _connection.QueryFirstOrDefault<int>(countSql, parameters); total = _connection.QueryFirstOrDefault<int>(countSql, parameters);
return _connection.Query<dc_base_order_data_source>(sql, parameters).AsList(); return _connection.Query<dc_base_order_data_source>(sql, parameters).AsList();
} }
/// <summary>
/// 更新采购建议
/// </summary>
public static void ResetPurchaseAdviseSingle(string bailun_sku,string warehouse_code)
{
_connection.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
consume_date = null,
error_stack_trace = "",
message = new { bailun_sku = bailun_sku, warehouse_code = warehouse_code }.ToJson(),
type = "刷新周转表"
});
}
public static void ResetPurchaseAdvise()
{
var task_name = "SResetPurchaseAdvise_v1";
var conn = _connection;
// 查询最后一次成功抓取的记录
var last_task_synchro_log = conn.QuerySingleOrDefault<task_synchro_log>(" select * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name });
var new_task_synchro_log = new task_synchro_log
{
create_date = DateTime.Now,
end_time = DateTime.Now.AddMinutes(-20),
status = 0,
task_name = task_name
};
if (last_task_synchro_log != null)
{
new_task_synchro_log.start_time = last_task_synchro_log.end_time.AddMinutes(-1);
}
else
{
new_task_synchro_log.start_time = DateTime.Now.AddMinutes(-60);
}
new_task_synchro_log.id = conn.Insert(new_task_synchro_log) ?? 0;
int count = 0;
var page = 1;
var rows = 1000;
while (true)
{
var datas = _connection.Query<dc_base_purchase_details>($" select * from dc_base_purchase_details where update_time>=@btime and update_time<=@etime limit {(page-1)*rows},{(rows)} ",new {
btime = new_task_synchro_log.start_time,
etime = new_task_synchro_log.end_time
}).ToList();
if (datas == null || datas.Count <= 0)
{
break;
}
page++;
foreach (var item in datas)
{
//添加到队列,重新刷数据
ResetPurchaseAdviseSingle(item.bailun_sku,item.warehouse_code);
count++;
}
}
// 清理已经删除的数据
_connection.Execute(" update dc_auto_purchase_advise_detailed set status=-1 where bailun_sku_warehouse_code in @bailun_sku_warehouse_codes ",new { },commandTimeout:0);
new_task_synchro_log.count = count;
new_task_synchro_log.status = 1;
conn.Update(new_task_synchro_log);
}
} }
......
...@@ -507,6 +507,7 @@ and ( t5.`status`=0 or t5.`status` is null ) and t7.sum_quantity_init_advise>0 ...@@ -507,6 +507,7 @@ and ( t5.`status`=0 or t5.`status` is null ) and t7.sum_quantity_init_advise>0
Console.WriteLine("开始出建议 完"); Console.WriteLine("开始出建议 完");
foreach (var item in datas1) foreach (var item in datas1)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
...@@ -718,6 +719,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -718,6 +719,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
foreach (var item in datas1) foreach (var item in datas1)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
...@@ -893,6 +895,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -893,6 +895,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -962,6 +965,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -962,6 +965,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1028,6 +1032,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -1028,6 +1032,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1094,6 +1099,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -1094,6 +1099,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1161,6 +1167,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -1161,6 +1167,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1295,6 +1302,7 @@ t8.bailun_order_ids ...@@ -1295,6 +1302,7 @@ t8.bailun_order_ids
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1358,6 +1366,7 @@ t8.bailun_order_ids ...@@ -1358,6 +1366,7 @@ t8.bailun_order_ids
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1426,6 +1435,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -1426,6 +1435,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1488,6 +1498,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -1488,6 +1498,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
{ {
foreach (var item in datas) foreach (var item in datas)
{ {
item.bailun_sku_warehouse_code = $"{item.bailun_sku}{item.warehouse_code}";
_connection.Insert(item); _connection.Insert(item);
} }
} }
...@@ -1664,7 +1675,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code ...@@ -1664,7 +1675,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku
left join dc_auto_purchase_advise as t4 on t1.main_id = t4.id left join dc_auto_purchase_advise as t4 on t1.main_id = t4.id
left join dc_auto_turnover as t5 on t1.warehouse_code = t5.warehouse_code and t1.bailun_sku = t5.bailun_sku left join dc_auto_turnover as t5 on t1.warehouse_code = t5.warehouse_code and t1.bailun_sku = t5.bailun_sku
where 1=1 "; where t1.status=0 ";
} }
else else
{ {
...@@ -1699,7 +1710,7 @@ left join dc_auto_purchase_advise as t4 on t1.main_id = t4.id ...@@ -1699,7 +1710,7 @@ left join dc_auto_purchase_advise as t4 on t1.main_id = t4.id
left join dc_auto_turnover as t5 on t1.warehouse_code = t5.warehouse_code and t1.bailun_sku = t5.bailun_sku left join dc_auto_turnover as t5 on t1.warehouse_code = t5.warehouse_code and t1.bailun_sku = t5.bailun_sku
left join dc_mid_transit as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code left join dc_mid_transit as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
left join dc_aims_transfer_warehouse_log as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.to_warehouse_code left join dc_aims_transfer_warehouse_log as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.to_warehouse_code
where 1=1 "; where t1.status=0 ";
} }
if (!string.IsNullOrWhiteSpace(m.product_inner_code)) if (!string.IsNullOrWhiteSpace(m.product_inner_code))
......
...@@ -60,6 +60,7 @@ namespace AutoTurnOver.Models.Report ...@@ -60,6 +60,7 @@ namespace AutoTurnOver.Models.Report
/// 目的仓库编码 /// 目的仓库编码
/// </summary> /// </summary>
public string warehouse_into_code { get; set; } public string warehouse_into_code { get; set; }
public string warehouse_code { get; set; }
/// <summary> /// <summary>
/// 目的仓库名称 /// 目的仓库名称
......
...@@ -52,6 +52,7 @@ namespace AutoTurnOver.Models ...@@ -52,6 +52,7 @@ namespace AutoTurnOver.Models
/// sku /// sku
/// </summary> /// </summary>
public string bailun_sku { get; set; } public string bailun_sku { get; set; }
public string bailun_sku_warehouse_code { get; set; }
/// <summary> /// <summary>
/// 仓库编码 /// 仓库编码
......
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