fixedbug

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

@@ -257,9 +257,11 @@ namespace Siger.Middlelayer.Utility.ImportEntities
     {
         [ExcelColumn("任务编号")]
         public string taskno { get; set; }
-        [ExcelColumn("产线层级")]
+        [ExcelColumn("发起工站")]
+        public string fromsection { get; set; }
+        [ExcelColumn("目标工站")]
         public string section { get; set; }
-        [ExcelColumn("触发方")]
+        [ExcelColumn("触发方式")]
         public string trigger { get; set; }
         [ExcelColumn("任务类型")]
         public string tasktype { get; set; }
@@ -269,8 +271,8 @@ namespace Siger.Middlelayer.Utility.ImportEntities
         public string ordernumber { get; set; }
         [ExcelColumn("产品编号")]
         public string productCode { get; set; }
-        [ExcelColumn("工序编号")]
-        public string routeNo { get; set; }
+        //[ExcelColumn("工序编号")]
+        //public string routeNo { get; set; }
         [ExcelColumn("工序名称")]
         public string route { get; set; }
         [ExcelColumn("程序号")]
@@ -281,6 +283,8 @@ namespace Siger.Middlelayer.Utility.ImportEntities
         public string fixtureCode { get; set; }
         [ExcelColumn("动作")]
         public string action { get; set; }
+        [ExcelColumn("下发状态")]
+        public string send { get; set; }
         [ExcelColumn("执行类型")]
         public string actionType { get; set; }
         [ExcelColumn("状态")]

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

@@ -35,7 +35,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         from u in uu.DefaultIfEmpty()
                         join r in _context.siger_project_product_route on q.routeid equals r.id into rr
                         from r in rr.DefaultIfEmpty()
-                        where q.projectId == projectid && q.status == (int)RowState.Valid
+                        where q.projectId == projectid && q.status != (int)RowState.Invalid
                         select new ResponseAutomationLocation
                         {
                             id = q.id,