x互锁信号修改

RC1266-AutoCountMachine/source/AutoCountClient/FrmXRay.cs

@@ -314,6 +314,11 @@ namespace OnlineStore.AutoCountClient
 
         private void btnInDoor_Down_Click(object sender, EventArgs e)
         {
+            if (equipBean.InXWork)
+            {
+                MessageBox.Show("警告：点料过程中，请勿开门", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             equipBean.CylinderMove(null, IO_Type.X_InDoor_Up, IO_Type.X_InDoor_Down);
         }
 
@@ -324,6 +329,11 @@ namespace OnlineStore.AutoCountClient
 
         private void btnOutDoor_Down_Click(object sender, EventArgs e)
         {
+            if (equipBean.InXWork)
+            {
+                MessageBox.Show("警告：点料过程中，请勿开门", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             equipBean.CylinderMove(null, IO_Type.X_OutDoor_Up, IO_Type.X_OutDoor_Down);
         }
         private void btnCloseAll_Click(object sender, EventArgs e)

RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs

@@ -188,7 +188,10 @@ namespace OnlineStore.DeviceLibrary
                 {
                     MoveInfo.NextMoveStep(StepEnum.XW11_StartCount);
                     WorkLog("点料：启用X射线点料，等待X射线可以启动");
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
+                    CylinderMove(MoveInfo, IO_Type.X_InDoor_Down, IO_Type.X_InDoor_Up);
+                    CylinderMove(MoveInfo, IO_Type.X_OutDoor_Down, IO_Type.X_OutDoor_Up);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_Lock_On, IO_VALUE.HIGH));
                 }
                 else if (MoveInfo.IsTimeOut(120))
                 {
@@ -199,14 +202,20 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(StepEnum.XW11_StartCount))
             {
-                if (xRayCanStart)
+                if (xRayCanStart &&  (IOValue(IO_Type.X_Lock_On).Equals(IO_VALUE.HIGH)) )
                 {
                     XW12_XRayStart();
-
                 }
                 else if (MoveInfo.IsTimeOut(120))
                 {
+                    if (!xRayCanStart)
+                    {
                         WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "]" + "等待 可以打开X射线  超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
+                    }
+                    else
+                    { 
+                        WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "]" + "等待 X互锁信号打开  超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
+                    }
                     LogUtil.error(WarnMsg, SecMoveInfo.ErrorLogType);
                     Alarm(AlarmType.IoSingleTimeOut);
                 }
@@ -310,11 +319,6 @@ namespace OnlineStore.DeviceLibrary
 
         private void XW13_GetXRayImage()
         { 
-            if (IOValue(IO_Type.X_Lock_On).Equals(IO_VALUE.LOW))
-            {
-                LogUtil.error("XW13_GetXRayImage 方法，X_Lock_On=LOW，直接返回");
-                return;
-            }
             MoveInfo.NextMoveStep(StepEnum.XW13_GetXRayImage);
             MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(8000));
             WorkLog("点料：清理" + path1_tif + "内容，开始获取X射线图形 ");