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

修改Io配置长度 

修改Buffer层级
This commit is contained in:
Han Qiang Qiang 2024-05-22 08:59:35 +08:00
parent 96663aa580
commit e0fb503a8b
9 changed files with 123 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Mainframe/Buffers/BufferModule.cs
View File

@ -112,7 +112,7 @@ namespace SicModules.Buffers
private BufferHomeRoutine _homeRoutine;
private BufferCoolingRoutine _coolingRoutine;
public BufferModule(ModuleName module) : base(3)
public BufferModule(ModuleName module) : base(1)
{
Module = module.ToString();
Name = module.ToString();

44
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.507",
"PreReleaseTagWithDash": "-----multiplate-develop.507",
"PreReleaseTag": "----multiplate-develop.508",
"PreReleaseTagWithDash": "-----multiplate-develop.508",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 507,
"WeightedPreReleaseNumber": 507,
"PreReleaseNumber": 508,
"WeightedPreReleaseNumber": 508,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.507",
"LegacySemVer": "23.9.2-----multiplate-de507",
"LegacySemVerPadded": "23.9.2-----multiplate-d0507",
"AssemblySemVer": "23.9.2.507",
"AssemblySemFileVer": "23.9.2.507",
"FullSemVer": "23.9.2-----multiplate-develop.507",
"InformationalVersion": "23.9.2-----multiplate-develop.507+Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"SemVer": "23.9.2-----multiplate-develop.508",
"LegacySemVer": "23.9.2-----multiplate-de508",
"LegacySemVerPadded": "23.9.2-----multiplate-d0508",
"AssemblySemVer": "23.9.2.508",
"AssemblySemFileVer": "23.9.2.508",
"FullSemVer": "23.9.2-----multiplate-develop.508",
"InformationalVersion": "23.9.2-----multiplate-develop.508+Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"ShortSha": "107dfc5",
"NuGetVersionV2": "23.9.2-----multiplate-d0507",
"NuGetVersion": "23.9.2-----multiplate-d0507",
"NuGetPreReleaseTagV2": "----multiplate-d0507",
"NuGetPreReleaseTag": "----multiplate-d0507",
"Sha": "96663aa580dc0278b914b884f5b332c24b3758d4",
"ShortSha": "96663aa",
"NuGetVersionV2": "23.9.2-----multiplate-d0508",
"NuGetVersion": "23.9.2-----multiplate-d0508",
"NuGetPreReleaseTagV2": "----multiplate-d0508",
"NuGetPreReleaseTag": "----multiplate-d0508",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 507,
"CommitsSinceVersionSourcePadded": "0507",
"UncommittedChanges": 1,
"CommitDate": "2024-05-13"
"CommitsSinceVersionSource": 508,
"CommitsSinceVersionSourcePadded": "0508",
"UncommittedChanges": 5,
"CommitDate": "2024-05-20"
}

4
SicRT/Config/IoProviderConfig.xml
View File

@ -65,7 +65,7 @@
<IoProvider load_condition="1" module="PM1" name="io" map_module="PM1" map_file="pm\pm1\_ioDefinePM1.xml" class="Aitex.Core.RT.Device.Devices.SiemensIoProvider" assembly="MECF.Framework.RT.EquipmentLibrary" >
<Parameter ip="192.168.1.105" port="102" plcType="4" diVariable="DB100.DBB100" doVariable="DB100.DBB152" aiVariable="DB100.DBD184" aoVariable="DB100.DBD908"
diLength="62" doLength="32" aiLength="1848" aoLength="1524" ></Parameter>
diLength="62" doLength="32" aiLength="2648" aoLength="1964" ></Parameter>
<Blocks>
<Block type="di" offset="0" size="640" value_type=""></Block>
<Block type="do" offset="0" size="640" value_type=""></Block>
@ -76,7 +76,7 @@
<IoProvider load_condition="1" module="PM2" name="io" map_module="PM2" map_file="pm\pm2\_ioDefinePM2.xml" class="Aitex.Core.RT.Device.Devices.SiemensIoProvider" assembly="MECF.Framework.RT.EquipmentLibrary" >
<Parameter ip="192.168.1.205" port="102" plcType="4" diVariable="DB100.DBB100" doVariable="DB100.DBB152" aiVariable="DB100.DBD184" aoVariable="DB100.DBD908"
diLength="62" doLength="32" aiLength="1848" aoLength="1524" ></Parameter>
diLength="62" doLength="32" aiLength="2648" aoLength="1964" ></Parameter>
<Blocks>
<Block type="di" offset="0" size="640" value_type=""></Block>
<Block type="do" offset="0" size="640" value_type=""></Block>

47
SicRT/Equipments/ManualAutoTransfer.cs
View File

@ -59,6 +59,8 @@ namespace SicRT.Modules
private double _timeBuffer3 { get; set; }
private double _timeLoad { get; set; }
private const int _bufferFloors = 1;
private Dictionary<string, DateTime> _loadWaferInfo = new();
private Dictionary<string, DateTime> _bufferWaferInfo = new();
@ -1434,7 +1436,7 @@ namespace SicRT.Modules
return;
}
for (var i = 0; i < 3; i++)
for (var i = 0; i < _bufferFloors; i++)
{
var canExcute = _buffer.HasWafer(i) && _buffer.CheckWaferNextStepIsThis(_buffer.Module, i);
if (canExcute)
@ -1778,22 +1780,22 @@ namespace SicRT.Modules
{
SlotItem bufferEmptySlot = null;
if (_tmRobot.CheckWaferNeedProcess(0, _pm1.Module)
&& _buffer.NoTray(2)
&& _buffer.NoWafer(2)
&& _buffer.CheckWaferNextStepIsThis(ModuleName.TMRobot, 0))
{
bufferEmptySlot = new SlotItem(ModuleName.Buffer, 2);
}
else if (_tmRobot.CheckWaferNeedProcess(0, _pm2.Module)
&& _buffer.NoTray(1)
&& _buffer.NoWafer(1)
&& _buffer.CheckWaferNextStepIsThis(ModuleName.TMRobot, 0))
{
bufferEmptySlot = new SlotItem(ModuleName.Buffer, 1);
}
//if (_tmRobot.CheckWaferNeedProcess(0, _pm1.Module)
// && _buffer.NoTray(2)
// && _buffer.NoWafer(2)
// && _buffer.CheckWaferNextStepIsThis(ModuleName.TMRobot, 0))
//{
// bufferEmptySlot = new SlotItem(ModuleName.Buffer, 2);
//}
//else if (_tmRobot.CheckWaferNeedProcess(0, _pm2.Module)
// && _buffer.NoTray(1)
// && _buffer.NoWafer(1)
// && _buffer.CheckWaferNextStepIsThis(ModuleName.TMRobot, 0))
//{
// bufferEmptySlot = new SlotItem(ModuleName.Buffer, 1);
//}
//TMRobot的下一步是Buffer3
else if (!_tmRobot.CheckWaferNeedProcess(0)
if (!_tmRobot.CheckWaferNeedProcess(0)
&& _buffer.NoTray(0)
&& _buffer.NoWafer(0)
&& _buffer.CheckWaferNextStepIsThis(ModuleName.TMRobot, 0))
@ -1870,8 +1872,8 @@ namespace SicRT.Modules
//pick,Buffer有Tray,机械手没有Tray
MonitorTmRobotBuffer1PickTask();
MonitorTmRobotBuffer2PickTask();
MonitorTmRobotBuffer3PickTask();
//MonitorTmRobotBuffer2PickTask();
//MonitorTmRobotBuffer3PickTask();
}
private void MonitorTmRobotBuffer3PickTask()
@ -2509,7 +2511,7 @@ namespace SicRT.Modules
waferCount++;
}
}
for (var i = 0; i < 3; i++)
for (var i = 0; i < _bufferFloors; i++)
{
if (_buffer.HasWafer(i))
{
@ -2533,7 +2535,7 @@ namespace SicRT.Modules
waferCount++;
}
for (var i = 0; i < 3; i++)
for (var i = 0; i < _bufferFloors; i++)
{
if (_buffer.HasWafer(i) && (_buffer.CheckWaferNeedProcess(i, processIn) || _buffer.GetWaferInfo(i).SubstHists.Select(x => x.locationID).Contains(processIn.ToString())))
{
@ -2564,7 +2566,7 @@ namespace SicRT.Modules
}
}
for (var i = 0; i < 3; i++)
for (var i = 0; i < _bufferFloors; i++)
{
if (_buffer.HasTray(i))
{
@ -2779,7 +2781,8 @@ namespace SicRT.Modules
}
else
{
if (_buffer.HasWafer(0) || _buffer.HasWafer(1) || _buffer.HasWafer(2))
//if (_buffer.HasWafer(0) || _buffer.HasWafer(1) || _buffer.HasWafer(2))
if (_buffer.HasWafer(0))
{
reason = $"Buffer have wafer!";
EV.PostWarningLog(LogSource, reason);

44
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.507",
"PreReleaseTagWithDash": "-----multiplate-develop.507",
"PreReleaseTag": "----multiplate-develop.508",
"PreReleaseTagWithDash": "-----multiplate-develop.508",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 507,
"WeightedPreReleaseNumber": 507,
"PreReleaseNumber": 508,
"WeightedPreReleaseNumber": 508,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.507",
"LegacySemVer": "23.9.2-----multiplate-de507",
"LegacySemVerPadded": "23.9.2-----multiplate-d0507",
"AssemblySemVer": "23.9.2.507",
"AssemblySemFileVer": "23.9.2.507",
"FullSemVer": "23.9.2-----multiplate-develop.507",
"InformationalVersion": "23.9.2-----multiplate-develop.507+Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"SemVer": "23.9.2-----multiplate-develop.508",
"LegacySemVer": "23.9.2-----multiplate-de508",
"LegacySemVerPadded": "23.9.2-----multiplate-d0508",
"AssemblySemVer": "23.9.2.508",
"AssemblySemFileVer": "23.9.2.508",
"FullSemVer": "23.9.2-----multiplate-develop.508",
"InformationalVersion": "23.9.2-----multiplate-develop.508+Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"ShortSha": "107dfc5",
"NuGetVersionV2": "23.9.2-----multiplate-d0507",
"NuGetVersion": "23.9.2-----multiplate-d0507",
"NuGetPreReleaseTagV2": "----multiplate-d0507",
"NuGetPreReleaseTag": "----multiplate-d0507",
"Sha": "96663aa580dc0278b914b884f5b332c24b3758d4",
"ShortSha": "96663aa",
"NuGetVersionV2": "23.9.2-----multiplate-d0508",
"NuGetVersion": "23.9.2-----multiplate-d0508",
"NuGetPreReleaseTagV2": "----multiplate-d0508",
"NuGetPreReleaseTag": "----multiplate-d0508",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 507,
"CommitsSinceVersionSourcePadded": "0507",
"UncommittedChanges": 1,
"CommitDate": "2024-05-13"
"CommitsSinceVersionSource": 508,
"CommitsSinceVersionSourcePadded": "0508",
"UncommittedChanges": 5,
"CommitDate": "2024-05-20"
}

44
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.507",
"PreReleaseTagWithDash": "-----multiplate-develop.507",
"PreReleaseTag": "----multiplate-develop.508",
"PreReleaseTagWithDash": "-----multiplate-develop.508",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 507,
"WeightedPreReleaseNumber": 507,
"PreReleaseNumber": 508,
"WeightedPreReleaseNumber": 508,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.507",
"LegacySemVer": "23.9.2-----multiplate-de507",
"LegacySemVerPadded": "23.9.2-----multiplate-d0507",
"AssemblySemVer": "23.9.2.507",
"AssemblySemFileVer": "23.9.2.507",
"FullSemVer": "23.9.2-----multiplate-develop.507",
"InformationalVersion": "23.9.2-----multiplate-develop.507+Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"SemVer": "23.9.2-----multiplate-develop.508",
"LegacySemVer": "23.9.2-----multiplate-de508",
"LegacySemVerPadded": "23.9.2-----multiplate-d0508",
"AssemblySemVer": "23.9.2.508",
"AssemblySemFileVer": "23.9.2.508",
"FullSemVer": "23.9.2-----multiplate-develop.508",
"InformationalVersion": "23.9.2-----multiplate-develop.508+Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"ShortSha": "107dfc5",
"NuGetVersionV2": "23.9.2-----multiplate-d0507",
"NuGetVersion": "23.9.2-----multiplate-d0507",
"NuGetPreReleaseTagV2": "----multiplate-d0507",
"NuGetPreReleaseTag": "----multiplate-d0507",
"Sha": "96663aa580dc0278b914b884f5b332c24b3758d4",
"ShortSha": "96663aa",
"NuGetVersionV2": "23.9.2-----multiplate-d0508",
"NuGetVersion": "23.9.2-----multiplate-d0508",
"NuGetPreReleaseTagV2": "----multiplate-d0508",
"NuGetPreReleaseTag": "----multiplate-d0508",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 507,
"CommitsSinceVersionSourcePadded": "0507",
"UncommittedChanges": 1,
"CommitDate": "2024-05-13"
"CommitsSinceVersionSource": 508,
"CommitsSinceVersionSourcePadded": "0508",
"UncommittedChanges": 5,
"CommitDate": "2024-05-20"
}

10
SicUI/MainView.xaml
View File

@ -444,14 +444,16 @@
Text="{Binding RTVersion}" />
</StackPanel>
<Grid Name="自动模块状态" Grid.Column="1" Visibility="{Binding EFEMInstalled, Converter={StaticResource BoolVisibilityConverter}}">
<!--下面这个Grid被手动隐藏了(Visibility="Collapsed")，方便调试，后期可以不隐藏-->
<Grid
Name="自动模块状态"
Grid.Column="1"
Visibility="{Binding EFEMInstalled, Converter={StaticResource BoolVisibilityConverter}}">
<!-- 下面这个Grid被手动隐藏了(Visibility="Collapsed")，方便调试，后期可以不隐藏 -->
<Grid
Grid.Column="1"
Margin="-25,8,0,8"
ColumnSpan="2"
IsHitTestVisible="{Binding IsReadOnlyMode, Converter={StaticResource BoolReverseConverter}}"
Visibility="Collapsed">
IsHitTestVisible="{Binding IsReadOnlyMode, Converter={StaticResource BoolReverseConverter}}">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />

3
SicUI/Models/Maintenances/TM/DeviceView.xaml
View File

@ -35,8 +35,7 @@
<StackPanel
Grid.Row="1"
Grid.Column="0"
Visibility="{Binding IsEFEMInstalled, Converter={StaticResource BoolVisibilityConverter}}">
Grid.Column="0">
<Grid Margin="10,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80" />

44
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.507",
"PreReleaseTagWithDash": "-----multiplate-develop.507",
"PreReleaseTag": "----multiplate-develop.508",
"PreReleaseTagWithDash": "-----multiplate-develop.508",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 507,
"WeightedPreReleaseNumber": 507,
"PreReleaseNumber": 508,
"WeightedPreReleaseNumber": 508,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.507",
"LegacySemVer": "23.9.2-----multiplate-de507",
"LegacySemVerPadded": "23.9.2-----multiplate-d0507",
"AssemblySemVer": "23.9.2.507",
"AssemblySemFileVer": "23.9.2.507",
"FullSemVer": "23.9.2-----multiplate-develop.507",
"InformationalVersion": "23.9.2-----multiplate-develop.507+Branch.----multiplate-develop.Sha.107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"SemVer": "23.9.2-----multiplate-develop.508",
"LegacySemVer": "23.9.2-----multiplate-de508",
"LegacySemVerPadded": "23.9.2-----multiplate-d0508",
"AssemblySemVer": "23.9.2.508",
"AssemblySemFileVer": "23.9.2.508",
"FullSemVer": "23.9.2-----multiplate-develop.508",
"InformationalVersion": "23.9.2-----multiplate-develop.508+Branch.----multiplate-develop.Sha.96663aa580dc0278b914b884f5b332c24b3758d4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "107dfc5a99f09aae590e06a0e89a833fc7563bf9",
"ShortSha": "107dfc5",
"NuGetVersionV2": "23.9.2-----multiplate-d0507",
"NuGetVersion": "23.9.2-----multiplate-d0507",
"NuGetPreReleaseTagV2": "----multiplate-d0507",
"NuGetPreReleaseTag": "----multiplate-d0507",
"Sha": "96663aa580dc0278b914b884f5b332c24b3758d4",
"ShortSha": "96663aa",
"NuGetVersionV2": "23.9.2-----multiplate-d0508",
"NuGetVersion": "23.9.2-----multiplate-d0508",
"NuGetPreReleaseTagV2": "----multiplate-d0508",
"NuGetPreReleaseTag": "----multiplate-d0508",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 507,
"CommitsSinceVersionSourcePadded": "0507",
"UncommittedChanges": 1,
"CommitDate": "2024-05-13"
"CommitsSinceVersionSource": 508,
"CommitsSinceVersionSourcePadded": "0508",
"UncommittedChanges": 5,
"CommitDate": "2024-05-20"
}