Sic-Software
/
SicMultiplate
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新版本1.3.0.40229 更新库文件

This commit is contained in:
SIC1016\caipeilun 2024-02-29 09:26:49 +08:00
parent 6f24a0e7c3
commit 3a5efd9831
14 changed files with 87 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SicRT/App.config
View File

@ -106,7 +106,7 @@
bindingConfiguration="Aitex_netTcpBinding"
contract="MECF.Framework.Common.PLC.IWcfPlcService"
name="Client_IWcfPlcService"/>
<endpoint address="net.tcp://127.0.0.1:9999/MultiProcessService"
<endpoint address="net.tcp://192.168.12.105:9999/MultiProcessService"
behaviorConfiguration="EndpointBehavior"
binding="netTcpBinding"
bindingConfiguration="Aitex_netTcpBinding"

2
SicRT/Config/System.sccfg
View File

@ -25,7 +25,7 @@
<config default="false" name="RecipeSaveToDB" description="Recipe文件保存到数据库" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
<config default="true" name="IsPMHostSignalTower" description="是否使用PM PLC控制三色灯；如果设定为False，则使用TM PLC控制三色灯" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
<config default="false" name="MultiProcessMode" visible="false" description="是否启用多机台工艺限制，即限制同一局域网内的机台同时进行工艺的数量" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="Sic08" name="MachineName" visible="false" description="机台名称" max="" min="" paramter="" tag="" unit="" type="String" />
<config default="Sic14" name="MachineName" visible="false" description="机台名称" max="" min="" paramter="" tag="" unit="" type="String" />
<config default="false" name="AllowTraceAOHopping" description="是否允许追踪AO跳变" max="" min="" paramter="" tag="" unit="" type="Bool" visible="true" />
<config default="true" name="AllowTraceDOHopping" description="是否允许追踪DO跳变" max="" min="" paramter="" tag="" unit="" type="Bool" visible="true" />
<config default="true" name="IgnoreMaintainTimeOutWarning" description="维护界面是否忽略Warning提示" max="" min="" paramter="" tag="" unit="" type="Bool" />

2
SicRT/Properties/AssemblyInfo.cs
View File

@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.3.0.40226")]
[assembly: AssemblyVersion("1.3.0.40229")]
[assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]

8
SicRT/ReleaseNotes.md
View File

@ -3,7 +3,13 @@
Auto-GE 自动通用版（适用有EFEM设备）
----
## Version 1.3.0.40229
- Bug修复
- 修复配置Maintain不生效的问题
- 新特性
- 触发部分按钮时，会触发MultiProcess提示，确认后继续进行动作
- MultiProcess暂时不限制Process数量（测试断线）
- 通讯周期修改为5s
## Version 1.3.0.40226
- Bug修复
- 修正TM、PM IO列表加载慢的问题

4
SicUI/Controls/ChooseDialogBoxView.xaml
View File

@ -7,12 +7,12 @@
xmlns:cal="http://www.caliburn.org"
xmlns:local="clr-namespace:SicUI.Controls"
mc:Ignorable="d"
Height="160" Width="400">
Height="auto" Width="400">
<Border BorderBrush="Gray" BorderThickness="0,1,0,0" Background="{DynamicResource Tab_BG}">
<Grid Margin="5">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="auto"/>
<RowDefinition Height="60"/>
</Grid.RowDefinitions>
<!--<Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Content_Highlight}">-->
<TextBlock Text="{Binding InfoStr}" TextWrapping="WrapWithOverflow" LineHeight="28" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" Margin="10,10,10,6" ></TextBlock>

108
SicUI/Models/Operations/Overviews/OverViewViewModel.cs
View File

@ -18,6 +18,7 @@ using System.Dynamic;
using Caliburn.Micro.Core;
using MECF.Framework.Common.Account.Permissions;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
using Aitex.Core.RT.SCCore;
namespace SicUI.Models.Operations.Overviews
{
@ -874,28 +875,33 @@ namespace SicUI.Models.Operations.Overviews
{
WindowManager wm = new WindowManager();
var isConnect = (bool)QueryDataClient.Instance.Service.GetData("MultiProcessClient.IsConnected");
if (!isConnect)
var workenable = (bool)QueryDataClient.Instance.Service.GetConfig("System.MultiProcessMode");
if (workenable)
{
var infos = "MultiProcessClient Disconnected";
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
wm.ShowDialog(dialog2);
return;
}
else
{
var infos = (string)QueryDataClient.Instance.Service.GetData("MultiProcessClient.ServiceInfo");
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
bool? bret = wm.ShowDialog(dialog2);
if (!bret.HasValue || !bret.Value)
var isConnect = (bool)QueryDataClient.Instance.Service.GetData("MultiProcessClient.IsConnected");
if (!isConnect)
{
var infos = "MultiProcessClient Disconnected";
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
wm.ShowDialog(dialog2);
return;
}
else
{
var infos = (string)QueryDataClient.Instance.Service.GetData("MultiProcessClient.ServiceInfo");
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
bool? bret = wm.ShowDialog(dialog2);
if (!bret.HasValue || !bret.Value)
{
return;
}
}
}
InvokeClient.Instance.Service.DoOperation("System.HomeAll");
@ -920,28 +926,33 @@ namespace SicUI.Models.Operations.Overviews
return;
}
var isConnect = (bool)QueryDataClient.Instance.Service.GetData("MultiProcessClient.IsConnected");
if (!isConnect)
var workenable = (bool)QueryDataClient.Instance.Service.GetConfig("System.MultiProcessMode");
if (workenable)
{
var infos = "MultiProcessClient Disconnected";
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
wm.ShowDialog(dialog2);
return;
}
else
{
var infos = (string)QueryDataClient.Instance.Service.GetData("MultiProcessClient.ServiceInfo");
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
bret = wm.ShowDialog(dialog2);
if (!bret.HasValue || !bret.Value)
var isConnect = (bool)QueryDataClient.Instance.Service.GetData("MultiProcessClient.IsConnected");
if (!isConnect)
{
var infos = "MultiProcessClient Disconnected";
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
wm.ShowDialog(dialog2);
return;
}
else
{
var infos = (string)QueryDataClient.Instance.Service.GetData("MultiProcessClient.ServiceInfo");
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
bret = wm.ShowDialog(dialog2);
if (!bret.HasValue || !bret.Value)
{
return;
}
}
}
InvokeClient.Instance.Service.DoOperation("System.SetAutoMode");
@ -1097,6 +1108,35 @@ namespace SicUI.Models.Operations.Overviews
public void Start(string jobID)
{
WindowManager wm = new WindowManager();
var workenable = (bool)QueryDataClient.Instance.Service.GetConfig("System.MultiProcessMode");
if (workenable)
{
var isConnect = (bool)QueryDataClient.Instance.Service.GetData("MultiProcessClient.IsConnected");
if (!isConnect)
{
var infos = "MultiProcessClient Disconnected";
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
wm.ShowDialog(dialog2);
return;
}
else
{
var infos = (string)QueryDataClient.Instance.Service.GetData("MultiProcessClient.ServiceInfo");
ChooseDialogBoxViewModel dialog2 = new ChooseDialogBoxViewModel();
dialog2.DisplayName = "MultiProcess Info";
dialog2.InfoStr = infos;
bool? bret = wm.ShowDialog(dialog2);
if (!bret.HasValue || !bret.Value)
{
return;
}
}
}
if (JobCheck(jobID))
WaferAssociationProvider.Instance.Start(jobID);
}

2
SicUI/Properties/AssemblyInfo.cs
View File

@ -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.3.0.40226")]
[assembly: AssemblyVersion("1.3.0.40229")]
[assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]

BIN
ThirdParty/MECF.Framework/MECF.Framework.Common.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll vendored
View File

Binary file not shown.