someupdate

Server/Common/Siger.Middlelayer.Share/Enum/ModuleEnum/Automation.cs

@@ -45,21 +45,23 @@ namespace Siger.Middlelayer.Share.Enum.ModuleEnum
         public enum TaskResultStatus
         {
             /// <summary>
-            /// 取消
-            /// </summary>
-            Cancel=0,
-            /// <summary>
             /// 待生产
             /// </summary>
+            [Description("待执行")]
             Waiting=1,
             /// <summary>
             /// 生产中
             /// </summary>
+            [Description("执行中")]
             Produce=2,
             /// <summary>
             /// 生产完成
             /// </summary>
-            Complated=3
+            [Description("任务完成")]
+            Complated=3,
+
+            [Description("取消")]
+            Cancel=4,
         }
         /// <summary>
         /// 设备状态 （自动任务）

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

@@ -20,7 +20,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
 
         public IEnumerable<ResponseAutomationMachineStatus> GetSectionStatus(int projectId, int section,List<int>sections)
         {
-            var data = from lv in _context.siger_project_level_section
+            var data = from atr in _context.siger_project_machine_attribution 
+                       join lv in _context.siger_project_level_section on atr.station equals lv.id
                        join ms in _context.siger_automation_machine_status on lv.id equals ms.section into mstemp
                        join plv in _context.siger_project_level_section on lv.parentid equals plv.id
                        from ms in mstemp.DefaultIfEmpty()

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

@@ -89,6 +89,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                              program=q.programnumber,
                              route=q.remark,
                              tasktype=EnumHelper.GetEnumDesc(q.tasktype),
+                             status=q.status,
                              
                         };
             Expression<Func<ResponseAutomationTasklist, bool>> sectonsExpression = f => true;