fix bug

Server/Apis/Siger.ApiWMS/Controllers/LocationController.cs

@@ -349,9 +349,11 @@ namespace Siger.ApiWMS.Controllers
         private List<ResponseLocationList> SearchLocation(int page, int pageSize, out int totalCount, bool paged = true, int id = 0, int isWavehouse = 0)
         {
             var locationData = new List<siger_wms_storage_location>();
-            var parentid = locationtype.GetList(f => f.status == (int)RowState.Valid && f.projectid == ProjectId).Select(f => f.parentid).ToList();
+            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);
 
@@ -416,18 +418,29 @@ namespace Siger.ApiWMS.Controllers
                         storageName = waveHouseDic[item.storageid],
                         serialNumber = item.serial_number,
                         state = item.status,
-                        field = new List<string>(),
-                        storeID = item.locationid
+                        field = new List<FiledName>(),
                     };
                     int i = 1;
-                    tmp.field.Insert(0, item.realname);
+                    tmp.field.Add(new FiledName
+                    {
+                        id = item.id,
+                        name = item.realname
+                    });
                     while (pid != 0)
                     {
                         var entity = location.Get(pid);
                         if (entity == null)
                             break;
+                        if(entity.typeid == LastTypeId)
+                        {
+                            tmp.storeID = entity.locationid;//赋值前端填写的储位ID
+                        }
                         //处理顺序问题
-                        tmp.field.Insert(0, entity.realname);
+                        tmp.field.Add(new FiledName
+                        {
+                            id = entity.id,
+                            name = entity.realname
+                        });
                         pid = entity.parentid;
 
                         //避免因为数据异常导致死循环
@@ -671,7 +684,7 @@ namespace Siger.ApiWMS.Controllers
                 var tmp = new List<string>();
                 tmp.Add(id++.ToString());
                 tmp.Add(item.storageName);
-                tmp.AddRange(item.field);
+                tmp.AddRange(item.field.Select(q => q.name));
                 tmp.Add(item.state == (int)RowState.Valid ? "否" : "是");
                 tmp.Add(item.serialNumber);
                 excelData.Add(tmp);