Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

XdCxRhDW.App/Controllers/PosController.cs

@@ -38,7 +38,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X1D1CX && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -139,7 +139,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X1D1CX && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -262,7 +262,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X2D1 && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -371,7 +371,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X2D1 && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -512,7 +512,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X2D1 && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -616,7 +616,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X2D1 && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -755,7 +755,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.RH && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -867,7 +867,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.RH && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1017,7 +1017,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X3TwoDto && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1132,7 +1132,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X3TwoDto && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1294,7 +1294,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X3TwoDto && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1403,7 +1403,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X3TwoDto && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1562,7 +1562,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X3TwoDfo && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1679,7 +1679,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X3TwoDfo && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1845,7 +1845,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X2Dfo && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {
@@ -1953,7 +1953,7 @@ namespace XdCxRhDW.App.Controllers
             {
                 if (dto.TaskID == null)
                 {
-                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Real
+                    runTask = await db.TaskInfos.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                     && p.PosType == EnumPosType.X2Dfo && p.TaskState == EnumTaskState.Running);
                     if (runTask == null)
                     {

XdCxRhDW.App/EditForms/TaskEditor.cs

@@ -208,7 +208,7 @@ namespace XdCxRhDW.App.EditForms
                 if (txtAdja2Sat.EditValue != null)
                     info.Adja2Sat = ((SatInfo)txtAdja2Sat.EditValue).SatCode;
                 info.TaskType = (EnumTaskType)txtTaskType.SelectedIndex;
-                if (info.TaskType == EnumTaskType.Real)
+                if (info.TaskType == EnumTaskType.Group)
                 {
                     info.CapDir = null;
                     info.CapDirFormat = null;
@@ -271,7 +271,7 @@ namespace XdCxRhDW.App.EditForms
 
         private void txtTaskType_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if ((EnumTaskType)txtTaskType.EditValue != EnumTaskType.History)
+            if ((EnumTaskType)txtTaskType.EditValue == EnumTaskType.Group)
             {
                 itemCapDir.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                 itemCapDirFormat.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -461,6 +461,7 @@ namespace XdCxRhDW.App.UserControl
                 }
             }
         }
+      
         private async void btn_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             var tsk = gridView1.GetFocusedRow() as TaskInfo;
@@ -468,7 +469,7 @@ namespace XdCxRhDW.App.UserControl
             {
                 try
                 {
-                    if (tsk.TaskType == EnumTaskType.History)
+                   if (tsk.TaskType != EnumTaskType.Group)
                     {
                         TxInfo tx;
                         List<TaskSigDto> tskSigsDto = new List<TaskSigDto>();
@@ -598,7 +599,7 @@ namespace XdCxRhDW.App.UserControl
             {
                 try
                 {
-                    if (tsk.TaskType == EnumTaskType.History)
+                    if (tsk.TaskType != EnumTaskType.Group)
                     {
                         ModelSvr svtItem = null;
                         if (tsk.PosType == EnumPosType.X2D1)

XdCxRhDW.Entity/EntityEnum.cs

@@ -28,7 +28,7 @@ namespace XdCxRhDW.Entity
         History,
 
         [Display(Name = "组合任务")]
-        Assembly
+        Group
     }
     /// <summary>
     /// 任务定位类型

XdCxRhDw.Dto/DtoEnum.cs

@@ -100,7 +100,13 @@ namespace XdCxRhDW.Dto
         /// 历史任务
         /// </summary>
         [Display(Name = "历史任务")]
-        History
+        History,
+
+        /// <summary>
+        /// 组合任务
+        /// </summary>
+        [Display(Name = "组合任务")]
+        Group
     }
 
     /// <summary>