Commit 16ba28a4 by xin.yang

fix bug

parent 230b1989
......@@ -352,8 +352,6 @@ namespace Siger.ApiWMS.Controllers
var locationType = locationtype.GetList(f => f.status == (int)RowState.Valid && f.projectid == ProjectId).ToList();
var parentid = locationType.Select(f => f.parentid).ToList();
var typeids = locationtype.GetList(f => f.status == (int)RowState.Valid && !parentid.Contains(f.id) && f.projectid == ProjectId).Select(f => f.id).ToList();
var sonLocationTyps = GetSonTypes(0, locationType);
var LastTypeId = sonLocationTyps.Any() ? sonLocationTyps.LastOrDefault()?.id ?? 0 : 0;
var locationAllData = location.GetList(f => f.status == (int)RowState.Valid && f.projectid == ProjectId);
......@@ -419,7 +417,8 @@ namespace Siger.ApiWMS.Controllers
serialNumber = item.serial_number,
state = item.status,
field = new List<FiledName>(),
warehouseId = item.storageid
warehouseId = item.storageid,
storeID = item.locationid,
};
int i = 1;
var locatype = locationType.FirstOrDefault(q => q.id == item.typeid);
......@@ -435,10 +434,6 @@ namespace Siger.ApiWMS.Controllers
var entity = location.Get(pid);
if (entity == null)
break;
if(entity.typeid == LastTypeId)
{
tmp.storeID = entity.locationid;//赋值前端填写的储位ID
}
//处理顺序问题
locatype = locationType.FirstOrDefault(q => q.id == entity.typeid);
tmp.field.Add(new FiledName
......
......@@ -14,6 +14,8 @@ namespace Siger.Middlelayer.WmsRepository.Response
/// 前端填写的储位ID
/// </summary>
public int storeID { get; set; }
public int warehouseId { get; set; }
}
public class FiledName
......
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