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

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

@@ -186,28 +186,34 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 if (string.IsNullOrEmpty(item.ParentFixtureTool))
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.PleaseInputParentFixtureCode}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
                 if (string.IsNullOrEmpty(item.FixtureTool))
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.PleaseInputSonFixtureCode}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
                 if (string.IsNullOrEmpty(item.Status))
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.PleaseInputStatus}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
                 if (item.ParentFixtureTool == item.FixtureTool)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.ParentSonSame}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
                 var parent = _context.siger_automation_fixture_tools.FirstOrDefault(q => q.code == item.ParentFixtureTool && q.projectId == projectid);
                 if (parent == null)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.FixtureToolNotFound}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
                 var son = _context.siger_automation_fixture_tools.FirstOrDefault(q => q.code == item.FixtureTool && q.projectId == projectid);
                 if (son == null)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.FixtureToolNotFound}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
                 var parentGuid = parent.guid;
                 if(son != null && parent != null)
@@ -216,16 +222,19 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                     if (exsit != null)
                     {
                         errors.Add($"{rowIndex},{(int)RequestEnum.DataExist}");
+                        return new CommonImportResult(0, string.Join(";", errors));
                     }
                 }
                 if (list.Count(q => q.FixtureTool == item.FixtureTool && q.ParentFixtureTool == item.ParentFixtureTool) > 1)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.DataExist}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
                 var parentExsit = _context.siger_automation_fixture_tools_assembly.FirstOrDefault(q => q.projectId == projectid && q.son == parentGuid);
                 if (parentExsit != null && !string.IsNullOrEmpty(parentExsit.parent))
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.LevelCountError}");
+                    return new CommonImportResult(0, string.Join(";", errors));
                 }
 
                 if (errors.Any())

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

@@ -212,7 +212,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 var entity = new siger_automation_location
                 {
                     guid = Guid.NewGuid().ToString(),
-                    locationid = location.id,
+                    location_cid = location.id,
+                    locationid = location.locationid,
                     fixturetools = fixturetool.guid,
                     attachment = "",
                     filename = "",