接驳台优化

source/AssemblyLineClient/FrmLineIO.cs

@@ -114,7 +114,7 @@ namespace OnlineStore.AssemblyLine
                 lblTrayNum.Text = "T3-C1托盘号：" + LineManager.Line.T3C1_TrayNum.ToString();
                 //if (cmbTray.SelectedIndex >= 0)
                 //{
-                    int trayNum =(int) numTrayNum.Value + 101;
+                    int trayNum =(int) numTrayNum.Value ;
                     TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
                     lblSelTrayNum.Text = tray.ToStr();
                 //}
@@ -412,7 +412,13 @@ namespace OnlineStore.AssemblyLine
         {
             //int num = cmbTray.SelectedIndex + 101;
             int num = (int)numTrayNum.Value;
+            if (num < 100)
+            {
+                MessageBox.Show("请输入大于100的托盘号","提示", MessageBoxButtons.OK,MessageBoxIcon.Error,MessageBoxDefaultButton.Button1);
+                return;
+            }
             TrayInfo tray = TrayManager.GetTrayInfo(num);
+            
             DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + tray.ToStr() + "", "提示", MessageBoxButtons.YesNo);
             if (resut.Equals(DialogResult.Yes))
             {
@@ -420,7 +426,7 @@ namespace OnlineStore.AssemblyLine
                 TrayManager.UpdateTrayInfo(num);
                 TrayInfo info = TrayManager.GetTrayInfo(num);
                 MessageBox.Show("更新成功：\r" + info.ToStr());
-                LogUtil.info("界面点击手动清空托盘信息：" + info.ToStr());
+                LogUtil.info("界面点击手动清空托盘，清空前【" + tray.ToStr() + "】，清空后：" + info.ToStr());
             }
 
         }
@@ -461,5 +467,11 @@ namespace OnlineStore.AssemblyLine
                 }
             }
         }
+
+        private void btnT3Reset_Click(object sender, EventArgs e)
+        {
+            LogUtil.info(Name + "点击：" + btnT3Reset.Text);
+            LineManager.Line.T3C1_Stop();
+        }
     }
 }

source/AssemblyLineClient/记录.txt

@@ -74,7 +74,17 @@
  T4料架处理修改。
 
 
+ 20210121
+ 需要修改：
+ 1.料仓调试模式下，不出入库，也不获取库位号。
+ 2.料仓压紧点位置根据料盘厚度来判断。
+ 3。仓门口，夹爪未抓起料后，判断料再下方，重新抓取一次
 
+ 复位时，进仓夹爪有料，保存状态，复位完成后继续出入库。
+
+ 大料入库时，夹爪上的料56寸时会撞
+ 已修改：
+ 料仓或者移栽调试状态时，不获取库位号。
 
 
 

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -66,11 +66,33 @@ namespace OnlineStore.DeviceLibrary
                                     //托盘在第一个阻挡处
                                     SecondMoveInfo.NewMove(LineMoveType.Fixture);
                                     SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_01_TrayCheck);
+                                    if (IsNgPro())
+                                    {
                                         CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡检测到托盘");
                                         ClearTrayRFID();
                                         SecondMoveInfo.OneWaitCanEndStep = true;
                                         SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.HIGH));
                                     }
+                                    else
+                                    {
+                                        if (IOValue(IO_Type.HY_TopCylinder_Up).Equals(IO_VALUE.LOW))
+                                        {
+                                            SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_03_StopDown);
+                                            LineStop();
+                                            IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
+                                            CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡下降");
+                                        }
+                                        else
+                                        {
+                                            SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_02_TopMove);
+                                            CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：顶升气缸下降 ");
+                                            IOMove(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW);
+                                            IOMove(IO_Type.HY_TopCylinder_Down, IO_VALUE.HIGH);
+                                            SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW));
+                                            LineStop();
+                                        }
+                                    }
+                                }
                             }
                             else
                             {
@@ -251,8 +273,13 @@ namespace OnlineStore.DeviceLibrary
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTrayLeave))
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_13_TrayLeave);
-                CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：等待800ms,托盘检测无信号");
-                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(800));
+                int time = 200;
+                if (IsNgPro())
+                {
+                    time = 800;
+                }
+                CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：等待"+ time + "ms,托盘检测无信号");
+                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(time));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_13_TrayLeave))
@@ -260,8 +287,17 @@ namespace OnlineStore.DeviceLibrary
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_14_TopDown);
                 CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降，横移电机 停止");
                 LineStop(SecondMoveInfo);
+                if (IsNgPro())
+                {
                     CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                 }
+                else
+                {
+                    IOMove(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW);
+                    IOMove(IO_Type.HY_TopCylinder_Down, IO_VALUE.HIGH);
+                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW));
+                }
+            }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
             {
                 CheckLog(" 托盘放行结束");