Commit 12de8771 by zhoujinhui

修改在线数量日志 新增采购员字段及导出字段

parent 9bd83a50
...@@ -1035,7 +1035,7 @@ left join dc_base_warehouse as t4 on t1.warehouse_code = t4.warehouse_code ...@@ -1035,7 +1035,7 @@ left join dc_base_warehouse as t4 on t1.warehouse_code = t4.warehouse_code
/// <returns></returns> /// <returns></returns>
public static List<dc_auto_shortage_push_route_dto> ShortagePushList(string platform, string bailun_sku, int offset, int limit, ref int total, DateTime? start_date, DateTime? end_date, string warehousecode, string warehousetype, int? warehousearea,int type = 0) public static List<dc_auto_shortage_push_route_dto> ShortagePushList(string platform, string bailun_sku, int offset, int limit, ref int total, DateTime? start_date, DateTime? end_date, string warehousecode, string warehousetype, int? warehousearea,int type = 0)
{ {
var sql = @"select t1.id, t1.platform, t1.bailun_sku,t3.warehouse_name, t1.warehouse_code, t1.push_date,t2.push_time from dc_auto_shortage_push as t1 var sql = @"select t1.id, t1.platform, t1.bailun_sku,t3.warehouse_name, t1.warehouse_code, t1.push_date,t2.push_time,t1.buyer_name from dc_auto_shortage_push as t1
left join dc_return_goods_push as t2 on t1.id =t2.shortage_push_id left join dc_return_goods_push as t2 on t1.id =t2.shortage_push_id
left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code
where 1=1 "; where 1=1 ";
...@@ -1043,7 +1043,7 @@ where 1=1 "; ...@@ -1043,7 +1043,7 @@ where 1=1 ";
var countSql = " select count(1) from dc_auto_shortage_push as t1 left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code where 1=1 "; var countSql = " select count(1) from dc_auto_shortage_push as t1 left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code where 1=1 ";
if (type == 1) if (type == 1)
{ {
sql = @"select t2.id, t2.platform, t2.bailun_sku,t3.warehouse_name, t2.warehouse_code,t2.push_time sql = @"select t2.id, t2.platform, t2.bailun_sku,t3.warehouse_name, t2.warehouse_code,t2.push_time,t2.buyer_name
from dc_return_goods_push as t2 from dc_return_goods_push as t2
left join dc_base_warehouse as t3 on t2.warehouse_code = t3.warehouse_code left join dc_base_warehouse as t3 on t2.warehouse_code = t3.warehouse_code
where 1=1 "; where 1=1 ";
......
...@@ -17,6 +17,11 @@ namespace AutoTurnOver.Models ...@@ -17,6 +17,11 @@ namespace AutoTurnOver.Models
public string warehouse_code { get; set; } public string warehouse_code { get; set; }
public DateTime push_date { get; set; } public DateTime push_date { get; set; }
public DateTime? push_time { get; set; } public DateTime? push_time { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string buyer_name { get; set; }
} }
public class export_sortage_push_search_dto public class export_sortage_push_search_dto
......
...@@ -133,7 +133,7 @@ namespace AutoTurnOver.Services ...@@ -133,7 +133,7 @@ namespace AutoTurnOver.Services
if (list == null || list.Count <= 0) break; if (list == null || list.Count <= 0) break;
orows += list.Count(); orows += list.Count();
DataTable table = new DataTable(); DataTable table = new DataTable();
string[] cols = new string[] { "仓库编码","仓库名称", "sku", "平台","改0 推送时间", "补货推送时间" }; string[] cols = new string[] { "仓库编码","仓库名称", "sku", "平台","改0 推送时间", "采购员", "补货推送时间" };
foreach (var item in cols) foreach (var item in cols)
{ {
table.Columns.Add(item); table.Columns.Add(item);
...@@ -147,6 +147,7 @@ namespace AutoTurnOver.Services ...@@ -147,6 +147,7 @@ namespace AutoTurnOver.Services
row["sku"] = itemData.bailun_sku; row["sku"] = itemData.bailun_sku;
row["平台"] = itemData.platform; row["平台"] = itemData.platform;
row["改0 推送时间"] = itemData.push_date; row["改0 推送时间"] = itemData.push_date;
row["采购员"] = itemData.buyer_name;
row["补货推送时间"] = itemData.push_time; row["补货推送时间"] = itemData.push_time;
table.Rows.Add(row); table.Rows.Add(row);
} }
......
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