From 8b12920442ffaf906a4a3d25ed1581d86ca7359c Mon Sep 17 00:00:00 2001 From: HCL <1625932291@qq.com> Date: Fri, 5 Jan 2024 14:43:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9TMRobot=20Pick=20Buffer?= =?UTF-8?q?1=E5=B1=82=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SicRT/Equipments/AutoTransfer.cs | 6 ++++-- SicRT/ReleaseNotes.md | 8 ++++++++ SicUI/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/SicRT/Equipments/AutoTransfer.cs b/SicRT/Equipments/AutoTransfer.cs index 3f8530ad..ec030f36 100644 --- a/SicRT/Equipments/AutoTransfer.cs +++ b/SicRT/Equipments/AutoTransfer.cs @@ -2356,7 +2356,9 @@ namespace SicRT.Modules && _load.IsReadyForPlace(ModuleName.TMRobot, 0) && _load.NoTray(0) && _load.HasWafer(0) - && _load.CheckWaferNeedProcess(0, ModuleName.PM1); + && _load.CheckWaferNeedProcess(0, ModuleName.PM1) + && _buffer.HasTrayAndNotExceedProcessCount(0) + && _buffer.NoWafer(0); if (canPick) { if (_buffer.IsReadyForPick(ModuleName.TMRobot, 0)) @@ -2410,7 +2412,7 @@ namespace SicRT.Modules //第二种情况：工艺开始时,如果Buffer中有Tray时,优先取Buffer中的Tray,而不是Cassette中Tray canPick = _tmRobot.NoTray(0) - && _buffer.HasTray(1) + && _buffer.HasTrayAndNotExceedProcessCount(1) && _buffer.NoWafer(1) && _load.IsAvailable && _load.IsReadyForPlace(ModuleName.TMRobot, 0) diff --git a/SicRT/ReleaseNotes.md b/SicRT/ReleaseNotes.md index b451956c..15fba63f 100644 --- a/SicRT/ReleaseNotes.md +++ b/SicRT/ReleaseNotes.md @@ -3,6 +3,14 @@ Auto-GE 自动通用版（适用有EFEM设备） ---- +## Version 1.1.4.14 +**2024-01-05** + +- Bug修复 + - 修改TMRobot Pick Buffer1层条件判断的BUG + +- 新特性 + - ReturnAll里Unload冷却时间定为300s ## Version 1.1.4.13 **2023-12-28** diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index 93a05620..ce45c0f2 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -54,5 +54,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.4.13")] +[assembly: AssemblyVersion("1.1.4.14")] [assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")] From 078e0368acb6c05dedc4640fef3cf5c828d8852f Mon Sep 17 00:00:00 2001 From: Liang Su Date: Tue, 9 Jan 2024 10:34:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=9A=E6=AC=A1Logout?= =?UTF-8?q?=E3=80=81Login=E5=90=8E=EF=BC=8CUI=E4=BC=9A=E5=8F=98=E5=8D=A1?= =?UTF-8?q?=E9=A1=BF=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SicUI/MainViewModel.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SicUI/MainViewModel.cs b/SicUI/MainViewModel.cs index c9414a8c..b63db9b5 100644 --- a/SicUI/MainViewModel.cs +++ b/SicUI/MainViewModel.cs @@ -809,6 +809,8 @@ namespace SicUI.Client LOG.Info( $"{BaseApp.Instance.UserContext.LoginName} logoff as {BaseApp.Instance.UserContext.Role.RoleName}"); BaseApp.Instance.UserContext.Clear(); + + ClearItems(); } catch (Exception exp) { From 80a236b53f0bf1aa4d2a215dfaa6b83ed30e675a Mon Sep 17 00:00:00 2001 From: Liang Su Date: Tue, 9 Jan 2024 10:38:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3v1.1.4.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SicRT/Properties/AssemblyInfo.cs | 2 +- SicRT/ReleaseNotes.md | 11 +++++++++++ SicUI/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs index e20bea30..676a2ba3 100644 --- a/SicRT/Properties/AssemblyInfo.cs +++ b/SicRT/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.1.4.13")] +[assembly: AssemblyVersion("1.1.4.15")] [assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")] \ No newline at end of file diff --git a/SicRT/ReleaseNotes.md b/SicRT/ReleaseNotes.md index 15fba63f..1bb5f1cf 100644 --- a/SicRT/ReleaseNotes.md +++ b/SicRT/ReleaseNotes.md @@ -3,6 +3,17 @@ Auto-GE 自动通用版（适用有EFEM设备） ---- + +## Version 1.1.4.15 +**2024-01-09** + +- Bug修复 + - 修正多次Logout、Login操作后，UI会变卡顿的问题 + +- 新特性 + - 无 + + ## Version 1.1.4.14 **2024-01-05** diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index ce45c0f2..40189850 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -54,5 +54,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.4.14")] +[assembly: AssemblyVersion("1.1.4.15")] [assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]