bopp下达取货任务修改

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -591,17 +591,32 @@ namespace WCS.Service.Extensions
         /// 写入取货任务
         /// </summary>
         /// <param name="addr">目标地址</param>
-        public void Pick(StationDeviceGroup addr, int task1 = 0, int task2 = 0)
+        public void Pick(StationDeviceGroup addr, int task1, int task2)
         {
             InfoLog.INFO_RGVINFO($"[{Entity.CODE}]--写入RGV取货任务-开始:{Data.TaskID_1},{Data.TaskID_2},{Data.TaskType_1},{Data.DestPosition_1},{Data.Trigger_1}");
             Data.TaskType_1 = RGVTaskType.取货;
             Data.DestPosition_1 = addr.Entity.CODE.GetShortCode();
-            if (task1 != 0) Data.TaskID_1 = task1;
-            if (task2 != 0) Data.TaskID_2 = task2;
+            Data.TaskID_1 = task1;
+            Data.TaskID_2 = task2;
             Data.Trigger_1++;
             InfoLog.INFO_RGVINFO($"[{Entity.CODE}]--写入RGV取货任务-结束:{Data.TaskID_1},{Data.TaskID_2},{Data.TaskType_1},{Data.DestPosition_1},{Data.Trigger_1}");
         }
 
+        ///// <summary>
+        ///// 写入取货任务
+        ///// </summary>
+        ///// <param name="addr">目标地址</param>
+        //public void Pick(StationDeviceGroup addr, int task1 = 0, int task2 = 0)
+        //{
+        //    InfoLog.INFO_RGVINFO($"[{Entity.CODE}]--写入RGV取货任务-开始:{Data.TaskID_1},{Data.TaskID_2},{Data.TaskType_1},{Data.DestPosition_1},{Data.Trigger_1}");
+        //    Data.TaskType_1 = RGVTaskType.取货;
+        //    Data.DestPosition_1 = addr.Entity.CODE.GetShortCode();
+        //    if (task1 != 0) Data.TaskID_1 = task1;
+        //    if (task2 != 0) Data.TaskID_2 = task2;
+        //    Data.Trigger_1++;
+        //    InfoLog.INFO_RGVINFO($"[{Entity.CODE}]--写入RGV取货任务-结束:{Data.TaskID_1},{Data.TaskID_2},{Data.TaskType_1},{Data.DestPosition_1},{Data.Trigger_1}");
+        //}
+
         /// <summary>
         /// 写入放货任务
         /// </summary>