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

Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

Browse Source
This commit is contained in:
hanqiangqiang 2026-08-19 14:04:57 +08:00
commit a0d03fd2e2
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
View File

@ -388,6 +388,7 @@
<DO_ITEM Index="86" Name="DO_MiddleLidSwingUnlock" BufferOffset="86" Addr="86" Description="" /> <DO_ITEM Index="86" Name="DO_MiddleLidSwingUnlock" BufferOffset="86" Addr="86" Description="" />
<DO_ITEM Index="89" Name="DO_BottomLidSwingLock" BufferOffset="89" Addr="89" Description="" /> <DO_ITEM Index="89" Name="DO_BottomLidSwingLock" BufferOffset="89" Addr="89" Description="" />
<DO_ITEM Index="90" Name="DO_BottomLidSwingUnlock" BufferOffset="90" Addr="90" Description="" /> <DO_ITEM Index="90" Name="DO_BottomLidSwingUnlock" BufferOffset="90" Addr="90" Description="" />
<DO_ITEM Index="91" Name="DO_TCSFluidInfusion" BufferOffset="110" Addr="110" Description="" />
<DO_ITEM Index="100" Name="DO_ChamMoveBodyUpDownEnable" BufferOffset="100" Addr="100" Description="" /> <DO_ITEM Index="100" Name="DO_ChamMoveBodyUpDownEnable" BufferOffset="100" Addr="100" Description="" />
<DO_ITEM Index="103" Name="DO_TowerGreen" BufferOffset="103" Addr="103" Description="" /> <DO_ITEM Index="103" Name="DO_TowerGreen" BufferOffset="103" Addr="103" Description="" />
<DO_ITEM Index="104" Name="DO_TowerYellow" BufferOffset="104" Addr="104" Description="" /> <DO_ITEM Index="104" Name="DO_TowerYellow" BufferOffset="104" Addr="104" Description="" />
@ -452,6 +453,8 @@
<DO_ITEM Index="183" Name="DO_ATMTransferAllowed" BufferOffset="183" Addr="183" Description="" /> <DO_ITEM Index="183" Name="DO_ATMTransferAllowed" BufferOffset="183" Addr="183" Description="" />
<DO_ITEM Index="184" Name="DO_PostProcessRunning" BufferOffset="184" Addr="184" Description="" /> <DO_ITEM Index="184" Name="DO_PostProcessRunning" BufferOffset="184" Addr="184" Description="" />
<DO_ITEM Index="185" Name="DO_ProcessIdleRunning" BufferOffset="185" Addr="185" Description="" /> <DO_ITEM Index="185" Name="DO_ProcessIdleRunning" BufferOffset="185" Addr="185" Description="" />
<DO_ITEM Index="186" Name="DO_ATMIdleRoutineRunning" BufferOffset="186" Addr="186" Description="" />
<DO_ITEM Index="187" Name="DO_VACIdleRoutineRunning" BufferOffset="187" Addr="187" Description="" />
<DO_ITEM Index="190" Name="DO_ConfinementRingUpDisable" BufferOffset="190" Addr="190" Description="" /> <DO_ITEM Index="190" Name="DO_ConfinementRingUpDisable" BufferOffset="190" Addr="190" Description="" />
<DO_ITEM Index="192" Name="DO_ReactorPressRisingRateFast" BufferOffset="192" Addr="192" Description="" /> <DO_ITEM Index="192" Name="DO_ReactorPressRisingRateFast" BufferOffset="192" Addr="192" Description="" />
<DO_ITEM Index="193" Name="DO_UPSEnable" BufferOffset="193" Addr="193" Description="" /> <DO_ITEM Index="193" Name="DO_UPSEnable" BufferOffset="193" Addr="193" Description="" />

6
App/Modules/SicModules/PMs/PMModuleDevice.cs
View File

@ -1147,11 +1147,11 @@ namespace SicModules.PMs
} }
else if (mGroupName == MfcGroupName.M1to16) else if (mGroupName == MfcGroupName.M1to16)
{ {
lst = new List<int>() { 1, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 16, 30 };//新增 30 lst = new List<int>() { 1, 3, 4, 6, 7, 8, 10, 11, 12, 13, 14, 16};//新增 30
} }
else if (mGroupName == MfcGroupName.M1toM17) else if (mGroupName == MfcGroupName.M1toM17)
{ {
lst = new List<int>() { 1, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 16, 17 }; lst = new List<int>() { 1, 3, 4, 6, 7, 8, 10, 11, 12, 13, 14, 16, 17 };
} }
else if (mGroupName == MfcGroupName.M18toM40No303439) else if (mGroupName == MfcGroupName.M18toM40No303439)
{ {
@ -1183,7 +1183,7 @@ namespace SicModules.PMs
} }
else if (mGroupName == MfcGroupName.M2toM42) else if (mGroupName == MfcGroupName.M2toM42)
{ {
lst = new List<int>() { 2, 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 32, 33, 35, 36, 37, 38, 40, 41, 42 }; lst = new List<int>() { 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 32, 33, 35, 36, 37, 38, 40 };
} }
else if (mGroupName == MfcGroupName.M2toM40NoFinal1MFC) else if (mGroupName == MfcGroupName.M2toM40NoFinal1MFC)
{ {

6
App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs
View File

@ -173,8 +173,8 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.VentPumpClose, IoGroupName.VentPump, false, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.VentPumpClose, IoGroupName.VentPump, false, _IoValueOpenCloseTimeout);
SetIoValueByGroup((int)RoutineStep.SetGroupV25, IoGroupName.V25, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetGroupV25, IoGroupName.V25, true, _IoValueOpenCloseTimeout);
//打开V103,关闭V105 //打开V103,关闭V105
SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout); //SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout);
SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout); //SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout);
//打开V31,打开V32 //打开V31,打开V32
SetIoValueByGroup((int)RoutineStep.SetV31, IoGroupName.V31, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetV31, IoGroupName.V31, true, _IoValueOpenCloseTimeout);
@ -216,7 +216,7 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.SetGroupJ, IoGroupName.J, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetGroupJ, IoGroupName.J, true, _IoValueOpenCloseTimeout);
//打开V65 //打开V65
SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout); //SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout);
//打开EPV2 //打开EPV2
SetIoValueByGroup((int)RoutineStep.SetEPV2, IoGroupName.EPV2, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetEPV2, IoGroupName.EPV2, true, _IoValueOpenCloseTimeout);

8
App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs
View File

@ -173,9 +173,9 @@ namespace SicModules.PMs.Routines
//关闭V72,打开V25 //关闭V72,打开V25
SetIoValueByGroup((int)RoutineStep.VentPumpClose, IoGroupName.VentPump, false, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.VentPumpClose, IoGroupName.VentPump, false, _IoValueOpenCloseTimeout);
SetIoValueByGroup((int)RoutineStep.SetGroupV25, IoGroupName.V25, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetGroupV25, IoGroupName.V25, true, _IoValueOpenCloseTimeout);
//打开V103,关闭V105 ////打开V103,关闭V105
SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout); //SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout);
SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout); //SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout);
//打开V31,打开V32 //打开V31,打开V32
SetIoValueByGroup((int)RoutineStep.SetV31, IoGroupName.V31, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetV31, IoGroupName.V31, true, _IoValueOpenCloseTimeout);
@ -217,7 +217,7 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.SetGroupJ, IoGroupName.J, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetGroupJ, IoGroupName.J, true, _IoValueOpenCloseTimeout);
//打开V65 //打开V65
SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout); //SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout);
//打开EPV2 //打开EPV2
SetIoValueByGroup((int)RoutineStep.SetEPV2, IoGroupName.EPV2, true, _IoValueOpenCloseTimeout); SetIoValueByGroup((int)RoutineStep.SetEPV2, IoGroupName.EPV2, true, _IoValueOpenCloseTimeout);

2
App/SicRT/Equipments/AutoTransfer.cs
View File

@ -1103,7 +1103,7 @@ namespace SicRT.Modules
{ {
//条件满足状态由AutoRunning切换到AutoIdle状态 //条件满足状态由AutoRunning切换到AutoIdle状态
if (_load.IsAvailable && _tmRobot.IsAvailable && _tmRobot.NoWafer(0) && _tmRobot.NoTray(0) && if (_load.IsAvailable && _tmRobot.IsAvailable && _tmRobot.NoWafer(0) && _tmRobot.NoTray(0) &&
_buffer.NoWafer(0) && _buffer.NoTray(0) && _buffer.NoWafer(1) && _buffer.NoTray(1) && _buffer.NoWafer(2) && _buffer.NoTray(2) && _buffer.NoWafer(0) && _buffer.NoTray(0) &&
_pm1.NoWafer(0) && _pm1.NoTray(0) && _pm2.NoWafer(0) && _pm2.NoTray(0) && !_controlJobList.Exists(c => c.State == EnumControlJobState.Executing)) _pm1.NoWafer(0) && _pm1.NoTray(0) && _pm2.NoWafer(0) && _pm2.NoTray(0) && !_controlJobList.Exists(c => c.State == EnumControlJobState.Executing))
{ {
return true; return true;

2
App/SicUI/Controls/Mainframe/M2C4EFEMView2.xaml
View File

@ -138,7 +138,7 @@
Canvas.Top="503" Canvas.Top="503"
Width="83" Width="83"
Height="8" Height="8"
IsDoorOpen="{Binding IsLLDoorOpen}" IsDoorOpen="{Binding IsLoadLeftSlitValveOpen}"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<unitControls:Door.RenderTransform> <unitControls:Door.RenderTransform>
<TransformGroup> <TransformGroup>

2
App/SicUI/Models/Maintenances/TM/TMViewModel.cs
View File

@ -286,7 +286,7 @@ namespace SicUI.Client.Models.Platform.TM
//private List<string> _modules = new List<string>() { "PM1", "PM2", "LoadLock", "UnLoad", "Buffer.01", "Buffer.02", "Buffer.03" }; //private List<string> _modules = new List<string>() { "PM1", "PM2", "LoadLock", "UnLoad", "Buffer.01", "Buffer.02", "Buffer.03" };
private List<string> _modules = new List<string>() { "PM1", "PM2", "LoadLock", "Buffer.01", "Buffer.02", "Buffer.03" }; private List<string> _modules = new List<string>() { "PM1", "PM2", "LoadLock", "Buffer.01" };
public List<string> Modules public List<string> Modules
{ {
get { return _modules; } get { return _modules; }