fix

WCS.Entity/WCS_TaskInfo.cs

@@ -269,10 +269,10 @@ namespace WCS.Entity
         public string ManualRemarks { get; set; }
 
         /// <summary>
-        ///  是否手动任务
+        ///  出库任务类型
         /// </summary>
-        [SugarColumn(ColumnDescription = "是否手动任务", IsNullable = true)]
-        public int IsMannel { get; set; }
+        [SugarColumn(ColumnDescription = "出库任务类型", IsNullable = true)]
+        public OutTypeEnum OutType { get; set; }
 
         /// <summary>
         /// 产品编码
@@ -388,4 +388,25 @@ namespace WCS.Entity
         [Description("已取消")]
         Cancel = 106
     }
+
+    /// <summary>
+    ///  出库任务类型
+    /// </summary>
+    public enum OutTypeEnum
+    {
+        /// <summary>
+        ///  自动出库任务
+        /// </summary>
+        自动出库任务 = 0,
+
+        /// <summary>
+        ///  全自动手动出库任务
+        /// </summary>
+        全自动手动出库任务 = 1,
+
+        /// <summary>
+        ///  半自动手动出库任务
+        /// </summary>
+        半自动手动出库任务 = 2
+    }
 }

WCS.Entity/WCS_TaskOld.cs

@@ -257,9 +257,9 @@ namespace WCS.Entity
         #endregion 条码物料相关信息
 
         /// <summary>
-        ///  是否手动任务
+        ///  出库任务类型
         /// </summary>
-        [SugarColumn(ColumnDescription = "是否手动任务", IsNullable = true)]
-        public int IsMannel { get; set; }
+        [SugarColumn(ColumnDescription = "出库任务类型", IsNullable = true)]
+        public OutTypeEnum OutType { get; set; }
     }
 }

WCS.WorkEngineering/Systems/SrmSystems.cs

@@ -84,10 +84,28 @@ namespace WCS.WorkEngineering.Systems
                               break;
 
                           case TaskType.OutDepot:
-                              task.Status = Entity.TaskStatus.ConveyorExecution;
-                              var dev = new Station(Device.All.FirstOrDefault(v => v.Code == task.SrmStation), this.World);
-                              dev.Data.TaskNumber = task.ID;
-                              task.AddWCS_TASK_DTL(db, task.SrmStation, "出库任务到达放货站台");
+                              switch (task.OutType)
+                              {
+                                  case OutTypeEnum.自动出库任务:
+                                      task.Status = Entity.TaskStatus.ConveyorExecution;
+                                      var dev = new Station(Device.All.FirstOrDefault(v => v.Code == task.SrmStation), this.World);
+                                      dev.Data.TaskNumber = task.ID;
+                                      task.AddWCS_TASK_DTL(db, task.SrmStation, "出库任务到达放货站台");
+                                      break;
+
+                                  case OutTypeEnum.全自动手动出库任务:
+
+                                      break;
+
+                                  case OutTypeEnum.半自动手动出库任务:
+                                      task.Status = Entity.TaskStatus.Finish;
+                                      task.AddWCS_TASK_DTL(db, task.SrmStation, "半自动手动出库任务结束");
+                                      break;
+
+                                  default:
+                                      break;
+                              }
+
                               break;
 
                           case TaskType.TransferDepot: