Commit 69534125 by guanzhenshan

采购入库记录导出增加导出采购单号

parent 4f7edc89
......@@ -38,5 +38,10 @@ namespace Bailun.DC.Models.ExportServices
/// 入库单号
/// </summary>
public string no { get; set; }
/// <summary>
/// 采购单号
/// </summary>
public string purchase_id { get; set; }
}
}
......@@ -23,7 +23,7 @@ namespace Bailun.DC.Services
/// <returns></returns>
public List<mPurchasePutin> ListPurchasePutin(DateTime start,DateTime end,int companyid)
{
var sql = $@"select t1.warehouse_code,t1.warehouse_name,t1.bailun_sku,t1.count,t1.update_time,inbound_id as no from dc_base_purchase_inbound t1
var sql = $@"select t1.warehouse_code,t1.warehouse_name,t1.bailun_sku,t1.count,t1.update_time,inbound_id as no,t1.purchase_id from dc_base_purchase_inbound t1
join dc_base_purchase t2 on t1.purchase_id = t2.purchase_id and t1.bailun_sku = t2.bailun_sku and t2.has_transfer = 0 and t2.`status`> 0
where t1.`status`= 1 and t1.update_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.update_time < '{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'";
......
......@@ -42,13 +42,13 @@ namespace Bailun.DC.Web.Areas.ExportFile.Controllers
var objPurchasePutin = _service.ListPurchasePutin(start, end, companyid);
var colNames = new List<string> {"采购入库单号","Sku","仓库编码", "仓库名称", "入库数量",
"入库时间" };
"入库时间","采购单号" };
var list = new List<string>();
foreach (var item in objPurchasePutin)
{
list.Add(item.no + "|" + item.bailun_sku + "|" + item.warehouse_code + "|" + item.warehouse_name + "|" + item.count + "|" +
item.update_time.ToString("yyyy-MM-dd HH:mm:ss"));
item.update_time.ToString("yyyy-MM-dd HH:mm:ss")+"|"+item.purchase_id);
}
var guid = Guid.NewGuid().ToString();
......
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