Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

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

@@ -421,10 +421,13 @@ namespace Siger.ApiWMS.Controllers
                         field = new List<FiledName>(),
                     };
                     int i = 1;
+                    var locatype = locationType.FirstOrDefault(q => q.id == item.typeid);
                     tmp.field.Add(new FiledName
                     {
                         id = item.id,
-                        name = item.realname
+                        name = item.realname,
+                        typeid = item.typeid,
+                        typename = locatype?.name ?? ""
                     });
                     while (pid != 0)
                     {
@@ -436,10 +439,13 @@ namespace Siger.ApiWMS.Controllers
                             tmp.storeID = entity.locationid;//赋值前端填写的储位ID
                         }
                         //处理顺序问题
+                        locatype = locationType.FirstOrDefault(q => q.id == item.typeid);
                         tmp.field.Add(new FiledName
                         {
                             id = entity.id,
-                            name = entity.realname
+                            name = entity.realname,
+                            typeid = entity.typeid,
+                            typename = locatype?.name ?? ""
                         });
                         pid = entity.parentid;
 

Server/Infrastructure/Repositories/Siger.Middlelayer.WmsRepository/Response/ResponseLocationList.cs

@@ -7,7 +7,7 @@ namespace Siger.Middlelayer.WmsRepository.Response
         public int id { get; set; }
         public int pid { get; set; }
         public string storageName { get; set; }
-        public List<string> field { get; set; }
+        public List<FiledName> field { get; set; } = new List<FiledName>();
         public string serialNumber { get; set; }
         public int state { get; set; }
         /// <summary>
@@ -15,4 +15,15 @@ namespace Siger.Middlelayer.WmsRepository.Response
         /// </summary>
         public int storeID { get; set; }
     }
+
+    public class FiledName
+    {
+        public int id { get; set; }
+
+        public string name { get; set; }
+
+        public int typeid { get; set; }
+
+        public string typename { get; set; }
+    }
 }