1

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -666,12 +666,12 @@ namespace OnlineStore.DeviceLibrary
                 else
                 {
                     string code = MoveInfo.MoveParam.WareCode;
-                    if (IOValue(IO_Type.HY_TrayCheck1).Equals(IO_VALUE.HIGH) &&(!getTrayReelOk))
+                    if (IOValue(IO_Type.HY_TrayCheck1).Equals(IO_VALUE.HIGH) && getTrayReelOk)
                     {
                         //接驳台有料，直接发arrive
                         int robotIndex = GetRobotIndex();
                         string msg = SServerManager.arrive3fRobotLocation(Name, robotIndex, code);
-                        OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台，更新托盘[" + currTrayNum + "]为空 ，发送 arrive3fRobotLocation = "+ msg);
+                        OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台，更新托盘[" + currTrayNum + "]为空 ，发送 arrive3fRobotLocation = " + msg,1);
                         afterPutCutOK = true;
                         //清空托盘 
                         TrayManager.UpdateTrayInfo(currTrayNum);
@@ -680,23 +680,23 @@ namespace OnlineStore.DeviceLibrary
                     {
                         //无料发取消任务
                         int robotIndex = GetRobotIndex();
-                        string msg = SServerManager.clearOutTask(Name,  code);
+                        string msg = SServerManager.clearOutTask(Name, code);
                         afterPutCutOK = true;
                         if (getTrayReelOk)
                         {
-                            OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台失败 ，更新托盘[" + currTrayNum + "]为NG ，发送 clearOutTask=" + msg);
+                            OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台失败 ，更新托盘[" + currTrayNum + "]为NG ，发送 clearOutTask=" + msg,1);
                             //更新托盘为NG 
                             TrayManager.UpdateInStoreNG(currTrayNum, true, "工单料放料到接驳台失败");
                         }
                         else
                         {
-                            OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台失败 (未抓起料盘），更新托盘[" + currTrayNum + "]为NG ，发送 clearOutTask=" + msg);
+                            OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台失败 (未抓起料盘），更新托盘[" + currTrayNum + "]为NG ，发送 clearOutTask=" + msg,1);
                             //更新托盘为NG 
-                            TrayManager.UpdateInStoreNG(currTrayNum, true, "工单料放料到接驳台失败（未抓起料盘）"); 
-                        } 
+                            TrayManager.UpdateInStoreNG(currTrayNum, true, "工单料放料到接驳台失败（未抓起料盘）");
+                        }
                     }
                     MoveInfo.NextMoveStep(LineMoveStep.JM_15_ClampCheck);
-                    OutLog(logName + MoveInfo.SLog + "：夹爪料盘检测无料 ");
+                    OutLog(logName + MoveInfo.SLog + "：夹爪料盘检测无料 ",1);
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_ClampCylinder_Check, IO_VALUE.LOW)); 
                 }
 
@@ -729,10 +729,10 @@ namespace OnlineStore.DeviceLibrary
                 //    string msg = SServerManager.arrive3fRobotLocation(Name, robotIndex, code);
                 //    afterPutCutOK = true;
                 //}
-                //else
-                //{
-                //    afterPutCutOK = true;
-                //}
+                else
+                {
+                    afterPutCutOK = true;
+                }
                 //TrayCanGo();
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_16_ReelArrive))