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

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

@@ -419,6 +419,7 @@ namespace Siger.ApiWMS.Controllers
                         serialNumber = item.serial_number,
                         state = item.status,
                         field = new List<FiledName>(),
+                        warehouseId = item.storageid
                     };
                     int i = 1;
                     var locatype = locationType.FirstOrDefault(q => q.id == item.typeid);