Skip to content

李娜 / SO827-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 95632016 由 LN
选项

1

1 个父辈 a413bcc3
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 3 行增加 和 2 行删除
dll/CodeLibrary.dll
此文件类型无法预览
dll/zxing.dll
此文件类型无法预览
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png

56.5 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png

76.3 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
...@@ -176,7 +176,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -176,7 +176,7 @@ namespace OnlineStore.DeviceLibrary
private object lockObj = ""; private object lockObj = "";
private void CheckFixture() private void CheckFixture()
{ {
if (Monitor.TryEnter(lockObj, 100)) if (Monitor.TryEnter(lockObj, TrayManager.mTimeOut))
{ {
try try
{ {
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -754,7 +754,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -754,7 +754,7 @@ namespace OnlineStore.DeviceLibrary
private object lockObj = ""; private object lockObj = "";
private void CheckFixture() private void CheckFixture()
{ {
if (Monitor.TryEnter(lockObj, 100)) if (Monitor.TryEnter(lockObj, TrayManager.mTimeOut))
{ {
try try
{ {
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
...@@ -15,6 +15,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -15,6 +15,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public class TrayManager public class TrayManager
{ {
public static int mTimeOut = 20;
public static bool DisTraySave = ConfigAppSettings.GetIntValue(Setting_Init.DisTraySave).Equals(1); public static bool DisTraySave = ConfigAppSettings.GetIntValue(Setting_Init.DisTraySave).Equals(1);
/// <summary> /// <summary>
/// 托盘集合，key=托盘编号，value=托盘详细信息 /// 托盘集合，key=托盘编号，value=托盘详细信息
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!