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

Html/src/view/fms/config/accountInfo.vue

@@ -23,7 +23,7 @@
             <div class="searchBtn">
                 <Button type="primary" class="twoWord" icon="ios-search" @click="tosearch()">{{ $t(1001) }}</Button>
                 <Button type="success" class="twoWord" icon="md-add-circle" @click="add()">{{$t('1002')}}</Button>
-                <Button type="warning" class="twoWord" icon="ios-create-outline" @click="edit()">{{$t('1003')}}</Button>
+                <Button type="warning" class="twoWord intervalRight" icon="ios-create-outline" @click="edit()">{{$t('1003')}}</Button>
                 <Button type="primary" class="fourWord" icon="md-download" @click="loadexcel()">{{$t('1005')}}</Button>
                 <Upload
                     style="display:inline-block"
@@ -127,9 +127,9 @@
                         <Upload
                             ref="upload"
                             :show-upload-list="false"
-                            :on-success="handleSuccess"
+                            :on-success="handleSuccess1"
                             :before-upload="handleBeforeUpload"
-                            :on-error="handleError"
+                            :on-error="handleError1"
                             type="drag"
                             :headers="headers"
                             :action="UploadAction">

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

@@ -50,8 +50,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             categoryid = c2.id,
                             category = c2.name,
                             updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : "",
-                            cate_guid = t2.guid,
-                            parentcate_guid = t1.guid,
+                            cate_guid = c2.guid ?? "",
+                            parentcate_guid = c1.guid ?? "",
                             parentguid = q.parent,
                             fixtureguid = q.son,
                             remark = q.remark,
@@ -106,11 +106,12 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             categoryid = c2.id,
                             category = c2.name,
                             updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : "",
-                            cate_guid = t2.guid,
-                            parentcate_guid = t1.guid,
+                            cate_guid = c2.guid ?? "",
+                            parentcate_guid = c1.guid ?? "",
                             parentguid = q.parent,
                             fixtureguid = q.son,
-                            remark = q.remark
+                            remark = q.remark,
+                            parentcategoryid = c1 == null ? 0 : c1.id
                         };
             var entities = query.OrderByDescending(q => q.id).AsNoTracking().ToList();
             return entities;

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

@@ -8,8 +8,10 @@ using Siger.Middlelayer.AccRepository.Repositories.Interface;
 using Siger.Middlelayer.AccRepository.Response;
 using Siger.Middlelayer.Common;
 using Siger.Middlelayer.Common.Extensions;
+using Siger.Middlelayer.Log;
 using Siger.Middlelayer.Repository.Data.Acc;
 using Siger.Middlelayer.Repository.Paged;
+using Siger.Middlelayer.Utility.ImportEntities;
 
 namespace Siger.Middlelayer.AccRepository.Repositories
 {
@@ -55,5 +57,37 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 return new PagedCollectionResult<ResponseFixtureToolsCategory>(entities, totalCount);
             }
         }
+
+        public CommonImportResult ImportData(IEnumerable<FixtureToolsCategoryTemplate> list, int projectid)
+        {
+            var entities = new List<siger_automation_fixture_tools_category>();
+
+            var errors = new List<string>();
+            var rowIndex = 1;
+            foreach (var item in list)
+            {
+                rowIndex++;
+                    //errors.Add($"{rowIndex},{(int)RequestEnum.ManageCatOnlyBySuperAdministrator}");
+
+
+            }
+
+            if (errors.Any())
+            {
+                return new CommonImportResult(0, string.Join(";", errors));
+            }
+
+            try
+            {
+                _context.siger_automation_fixture_tools_category.AddRange(entities);
+                _context.SaveChanges();
+                return new CommonImportResult(1, "1");
+            }
+            catch(Exception e)
+            {
+                Logger.WriteLineError(e.Message);
+                throw;
+            }
+        }
     }
 }