Commit e19065bd by xin.yang

fix bug

parent b2e971e0
...@@ -693,18 +693,24 @@ namespace Siger.ApiWMS.Controllers ...@@ -693,18 +693,24 @@ namespace Siger.ApiWMS.Controllers
public IActionResult ExportLocation() public IActionResult ExportLocation()
{ {
var data = SearchLocation(0, 0, out int count, false); var data = SearchLocation(0, 0, out int count, false);
var excelData = new List<List<string>>(); var titleData = new List<string>()
//title {
excelData.Add(GetExcelTitle()); "仓库名称"
};
var range = locationtype.GetList(f => f.status == (int)RowState.Valid && f.projectid == ProjectId).OrderBy(f => f.id).Select(f => f.name).ToList();
titleData.AddRange(range);
titleData.Add("是否停用");
titleData.Add("ID");
var excelData = new List<List<string>> { titleData };
//data //data
foreach (var item in data) foreach (var item in data)
{ {
var tmp = new List<string>(); var tmp = new List<string>();
tmp.Add(item.storeID.ToString());
tmp.Add(item.storageName); tmp.Add(item.storageName);
tmp.AddRange(item.field.Select(q => q.val)); tmp.AddRange(item.field.Select(q => q.val));
tmp.Add(item.state == (int)RowState.Valid ? "否" : "是"); tmp.Add(item.state == (int)RowState.Valid ? "否" : "是");
tmp.Add(item.serialNumber); //tmp.Add(item.serialNumber);
tmp.Add(item.storeID.ToString());
excelData.Add(tmp); excelData.Add(tmp);
} }
......
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