|
@ -67,7 +67,6 @@ namespace SCP.Views.PlanData |
|
|
{ |
|
|
{ |
|
|
Grid_V_TB_ARRIVE_DETAIL.RecordCount = ret.Result.Count(); |
|
|
Grid_V_TB_ARRIVE_DETAIL.RecordCount = ret.Result.Count(); |
|
|
var _ls = SortAndPage(ret.Result, Grid_V_TB_ARRIVE_DETAIL); |
|
|
var _ls = SortAndPage(ret.Result, Grid_V_TB_ARRIVE_DETAIL); |
|
|
|
|
|
|
|
|
var lst = _ls.ToList(); |
|
|
var lst = _ls.ToList(); |
|
|
using (ScpEntities db = EntitiesFactory.CreateScpInstance()) |
|
|
using (ScpEntities db = EntitiesFactory.CreateScpInstance()) |
|
|
{ |
|
|
{ |
|
@ -99,6 +98,22 @@ namespace SCP.Views.PlanData |
|
|
{ |
|
|
{ |
|
|
if (ret.State == ReturnStatus.Succeed) |
|
|
if (ret.State == ReturnStatus.Succeed) |
|
|
{ |
|
|
{ |
|
|
|
|
|
var lst = ret.Result.ToList(); |
|
|
|
|
|
using (ScpEntities db = EntitiesFactory.CreateScpInstance()) |
|
|
|
|
|
{ |
|
|
|
|
|
foreach (var lt in lst) |
|
|
|
|
|
{ |
|
|
|
|
|
if (string.IsNullOrEmpty(lt.PartDesc1)) |
|
|
|
|
|
{ |
|
|
|
|
|
var partModel = db.TA_PART.FirstOrDefault(p => p.PartCode == lt.PartCode && p.Site == lt.Site); |
|
|
|
|
|
if (partModel != null) |
|
|
|
|
|
{ |
|
|
|
|
|
lt.PartDesc1 = partModel.PartDesc1; |
|
|
|
|
|
lt.Unit = partModel.Unit; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
Dictionary<string, string> cellheader = new Dictionary<string, string> { |
|
|
Dictionary<string, string> cellheader = new Dictionary<string, string> { |
|
|
{ "ArrvBillNum", "单据号" }, |
|
|
{ "ArrvBillNum", "单据号" }, |
|
@ -113,7 +128,7 @@ namespace SCP.Views.PlanData |
|
|
{ "ShipTime", "时间" }, |
|
|
{ "ShipTime", "时间" }, |
|
|
{ "Remark", "备注" }, |
|
|
{ "Remark", "备注" }, |
|
|
}; |
|
|
}; |
|
|
string url = EntityListToExcel2003(cellheader, ret.Result.ToList(), "审核明细"); |
|
|
string url = EntityListToExcel2003(cellheader, lst, "审核明细"); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|