横移顶升提前上升优化

source/AssemblyLineClient/FrmLineStore.cs

@@ -474,7 +474,8 @@ namespace OnlineStore.AssemblyLine
             //    //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
             //    //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
             //}
             //}
             lblStatus.Text = KTK_Store.GetRunStr(lineBean.lineStatus, lineBean.runStatus) + canScanCode;
             lblStatus.Text = KTK_Store.GetRunStr(lineBean.lineStatus, lineBean.runStatus) + canScanCode;
-            string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : LineManager.Line.WarnMsg + "\r\n";
+            string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
+            string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time+ LineManager.Line.WarnMsg + "\r\n";
 
 
             lblMoveInfo.Text = LineManager.Line.GetMoveStr();
             lblMoveInfo.Text = LineManager.Line.GetMoveStr();
             if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
             if (TrayManager.TrayErrorMsg.Equals("").Equals(false))

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -274,9 +274,17 @@ namespace OnlineStore.DeviceLibrary
                         CheckLog("托盘放行  " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
                         CheckLog("托盘放行  " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
                         //   SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
                         //   SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
                     }
                     }
-                    else
+                    else 
                     {
                     {
-                        CheckLog("托盘检测：不需要此托盘，结束处理 ）");
+                        CheckLog("托盘检测：不需要此托盘，写一下顶升上升，结束处理");
+                        if (Config.SidesWayNum.Equals(2))
+                        {
+                            CylinderMove(null, IO_Type.SW_TopCylinder_Down, IO_Type.SW_TopCylinder_Up);
+                            if (  LineManager.Line.SwCanUpMove(3))
+                            {
+                                LineManager.Line.CylinderMove(null, IO_Type.SW3_TopCylinder_Down, IO_Type.SW3_TopCylinder_Up);
+                            }
+                        }
                         SMoveEnd();
                         SMoveEnd();
                     }
                     }
                 }
                 }

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -413,9 +413,13 @@ namespace OnlineStore.DeviceLibrary
             TimeSpan span = DateTime.Now - StartTime;
             TimeSpan span = DateTime.Now - StartTime;
             LogUtil.info(Name + ",停止运行，总运行时间：" + span.ToString());
             LogUtil.info(Name + ",停止运行，总运行时间：" + span.ToString());
         }
         }
-
+        public DateTime LastAlarmTime = DateTime.Now; 
         public override void Alarm(LineAlarmType alarmType)
         public override void Alarm(LineAlarmType alarmType)
         {
         {
+            if (alarmType.Equals(LineAlarmType.None).Equals(false))
+            {
+                LastAlarmTime = DateTime.Now;
+            }
             if (this.alarmType.Equals(alarmType))
             if (this.alarmType.Equals(alarmType))
             {
             {
                 return;
                 return;
@@ -640,9 +644,9 @@ namespace OnlineStore.DeviceLibrary
                 if (runStatus.Equals(LineRunStatus.Wait))
                 if (runStatus.Equals(LineRunStatus.Wait))
                 {
                 {
                     //取新的Io状态
                     //取新的Io状态
-                    IO_VALUE fuweiValue = IOValue(IO_Type.Start_BTN);
-                    IO_VALUE lastFuwei = DILastValueMap[IO_Type.Start_BTN];
-                    addLastDI(IO_Type.Start_BTN, fuweiValue);
+                   IO_VALUE fuweiValue = IOValue(IO_Type.Reset_BTN);
+                    IO_VALUE lastFuwei = DILastValueMap[IO_Type.Reset_BTN];
+                    addLastDI(IO_Type.Reset_BTN, fuweiValue);
                     bool isAutoStart = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun) == 1;
                     bool isAutoStart = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun) == 1;
 
 
                     //收到复位信号后启动
                     //收到复位信号后启动

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -285,11 +285,19 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         // SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
                         // SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
                         SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
                         SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
-                        CheckLog("放托盘（放开阻挡）" + MoveInfo.SLog + " 托盘 【" + currTrayNum + "】直接放行");
+                        CheckLog("放托盘（放开阻挡）" + MoveInfo.SLog + " 托盘 【" + currTrayNum + "】直接放行，判断顶升需要下降或上升");
                         if (Config.SidesWayNum <= 0)
                         if (Config.SidesWayNum <= 0)
                         {
                         {
                             CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
                             CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
                         }
                         }
+                        else if (Config.SidesWayNum.Equals(4))
+                        {
+                            CylinderMove(null, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP);
+                            if (LineManager.Line.SwCanUpMove(1))
+                            {
+                                LineManager.Line.CylinderMove(null, IO_Type.SW1_TopCylinder_Down, IO_Type.SW1_TopCylinder_Up);
+                            }
+                        }
                         //MO_14_TopCylinder_Down();
                         //MO_14_TopCylinder_Down();
                     }
                     }
                 }
                 }