fix bug

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

@@ -940,7 +940,7 @@ namespace Siger.ApiWMS.Controllers
                 if (Location.id == locationTypeId)
                 {
                     var locationIdExist = location.Get(q => q.projectid == ProjectId && q.status == (int)RowState.Valid && q.typeid == locationTypeId &&
-                        q.locationid == req.storeID.ToInt());
+                        q.locationid == req.storeID.ToInt() && q.storageid == req.warehouseid);
                     if (locationIdExist != null)
                     {
                         throw new BadRequestException(RequestEnum.IDExist);
@@ -1074,7 +1074,7 @@ namespace Siger.ApiWMS.Controllers
                 if(Location.id == locationTypeId)
                 {
                     var locationIdExist = location.Get(q => q.projectid == ProjectId && q.status == (int)RowState.Valid && q.typeid == locationTypeId &&
-                        q.locationid == req.storeID.ToInt() && q.id != Location.locationid.ToInt());
+                        q.locationid == req.storeID.ToInt() && q.id != Location.locationid.ToInt() && q.storageid == req.warehouseid);
                     if (locationIdExist != null)
                     {
                         throw new BadRequestException(RequestEnum.IDExist);

Server/Common/Siger.Middlelayer.Utility/ImportEntities/FixtureTools.cs

@@ -190,6 +190,8 @@ namespace Siger.Middlelayer.Utility.ImportEntities
 
     public class AutomationLocationTemplate : ImportBase
     {
+        [ExcelColumn("*仓库名称")]
+        public string Warehouse { get; set; }
         [ExcelColumn("*储位ID")]
         public string LocationId { get; set; }
 

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationLocationRepository.cs

@@ -142,7 +142,12 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.FixtureToolNotFound}");
                 }
-                var location = _context.siger_wms_storage_location.FirstOrDefault(q => q.locationid == item.LocationId.ToInt() && q.projectId == projectid && q.status == (int)RowState.Valid);
+                var warehouse = _context.siger_wms_storage.FirstOrDefault(q => q.status == (int)RowState.Valid && q.projectId == projectid && q.name == item.Warehouse);
+                if(warehouse == null)
+                {
+                    errors.Add($"{rowIndex},{(int)RequestEnum.WaveHouseIDNotExist}");
+                }
+                var location = _context.siger_wms_storage_location.FirstOrDefault(q => q.locationid == item.LocationId.ToInt() && q.storageid == warehouse.id && q.projectId == projectid && q.status == (int)RowState.Valid);
                 if (location == null || item.LocationId.ToInt() <= 0)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.LocationNull}");
@@ -166,7 +171,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 var entity = new siger_automation_location
                 {
                     guid = Guid.NewGuid().ToString(),
-                    locationid = item.LocationId.ToInt(),
+                    locationid = location.id,
                     fixturetools = fixturetool.guid,
                     attachment = "",
                     filename = "",