界面调整

source/AssemblyLineClient/FrmLineStore.cs

@@ -847,5 +847,34 @@ namespace OnlineStore.AssemblyLine
                 LogUtil.UpdateLogbox();
                 LogUtil.UpdateLogbox();
             }
             }
         }
         }
+
+        private void 清空日志ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+            LogUtil.ClearLog();
+        }
+
+        private void 复制日志ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+            Clipboard.SetDataObject(logBox.Text);
+            MessageBox.Show("已复制日志到粘贴板！");
+        }
+
+        private void 清空托盘信息ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            DialogResult resut = MessageBox.Show("确定手动清空所有托盘信息？", "提示", MessageBoxButtons.YesNo);
+            if (resut.Equals(DialogResult.Yes))
+            {
+                List<TrayInfo> tray = TrayManager.getTrayList();
+                LogUtil.info("-------------------点击：清空托盘。清空前打印托盘信息：");
+                foreach (TrayInfo t in tray)
+                {
+                    LogUtil.info(t.ToStr());
+                }
+                TrayManager.ClearTrayInfo();
+                LogUtil.info("-------------------点击：清空托盘。托盘内容已清空");
+            }
+        }
     }
     }
 }
 }

source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs

@@ -376,11 +376,13 @@ namespace OnlineStore.DeviceLibrary
             while (true)
             while (true)
             {
             {
                 Thread.Sleep(50);
                 Thread.Sleep(50);
-                if (IOManager.IOValue(moveDO, subType).Equals(IO_VALUE.LOW))
-                { 
-                    IOManager.IOMove(moveDO, IO_VALUE.HIGH, subType); 
-                }
+
                 TimeSpan span = DateTime.Now - startTime;
                 TimeSpan span = DateTime.Now - startTime;
+                if (span.TotalSeconds > 1 && IOManager.IOValue(moveDO, subType).Equals(IO_VALUE.LOW))
+                {
+                    LogUtil.error(subType + " LineRunAndWait1  转动[" + moveDO + "][" + checkDI + "]，已等待[" + FormUtil.GetSpanStr(span) + "]，重写IO：" + moveDO);
+                    IOManager.IOMove(moveDO, IO_VALUE.HIGH, subType);
+                }
                 if (!InTurn)
                 if (!InTurn)
                 {
                 {
                     isStop = true;
                     isStop = true;
@@ -416,6 +418,11 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 Thread.Sleep(50);
                 Thread.Sleep(50);
                 TimeSpan span = DateTime.Now - startTime;
                 TimeSpan span = DateTime.Now - startTime;
+                if (span.TotalSeconds > 2 && IOManager.IOValue(moveDO, subType).Equals(IO_VALUE.LOW))
+                {
+                    LogUtil.error(subType + " LineRunAndWait2  转动[" + moveDO + "][" + checkDI + "]，已等待[" + FormUtil.GetSpanStr(span) + "]，重写IO：" + moveDO);
+                    IOManager.IOMove(moveDO, IO_VALUE.HIGH, subType);
+                }
                 if (!InTurn)
                 if (!InTurn)
                 {
                 {
                     isStop = true;
                     isStop = true;