fix bug

Server/Apis/Siger.ApiACC/Controllers/FixtureToolsAssemblyController.cs

@@ -101,6 +101,7 @@ namespace Siger.ApiACC.Controllers
                     ParentPartNumber = item.partnumber,
                     ParentFixtureTool = item.name,
                     ParentSpecfication = item.specfication,
+                    ParentCode = item.code,
                     Category = "",
                     FixtureTool = "",
                     PartNumber = "",
@@ -120,10 +121,12 @@ namespace Siger.ApiACC.Controllers
                             ParentPartNumber = son.parentpartnumber,
                             ParentFixtureTool = son.parentname,
                             ParentSpecfication = son.parentspecfication,
+                            ParentCode = item.parentcode,
                             Category = son.category,
                             FixtureTool = son.name,
                             PartNumber = son.partnumber,
                             Specfication = son.specfication,
+                            Code = son.code,
                             Status = son.status == (int)RowState.Valid ? "可用" : "停用",
                             Remark = son.remark,
                             Updator = son.updator,

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

@@ -148,6 +148,9 @@ namespace Siger.Middlelayer.Utility.ImportEntities
         [ExcelColumn("父工装规格")]
         public string ParentSpecfication { get; set; }
 
+        [ExcelColumn("父工装编号")]
+        public string ParentCode { get; set; }
+
         [ExcelColumn("子工装类型")]
         public string Category { get; set; }
 
@@ -160,6 +163,9 @@ namespace Siger.Middlelayer.Utility.ImportEntities
         [ExcelColumn("子工装规格")]
         public string Specfication { get; set; }
 
+        [ExcelColumn("子工装编号")]
+        public string Code { get; set; }
+
         [ExcelColumn("状态")]
         public string Status { get; set; }
 

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

@@ -61,7 +61,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             parentcategoryid = c1 == null ? 0 : c1.id,
                             parentcategory = c1.name ?? "",
                             parentpartnumber = t1.partnumber ?? "",
-                            parentspecfication = t1.specification ?? ""
+                            parentspecfication = t1.specification ?? "",
+                            parentcode = t1.code ?? ""
                         };
             Expression<Func<ResponseAumationFixtureToolsAssembly, bool>> categoryExpression = f => true;
             if (category > 0)

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/FixtureToolsCategory.cs

@@ -152,5 +152,6 @@ namespace Siger.Middlelayer.AccRepository.Response
         public string parentcategory { get; set; }
         public string parentpartnumber { get; set; }
         public string parentspecfication { get; set; }
+        public string parentcode { get; set; }
     }
 }