diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
index bb6b34c..f019bc9 100644
--- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
@@ -388,6 +388,7 @@
+
@@ -452,6 +453,8 @@
+
+
diff --git a/App/Modules/SicModules/PMs/PMModuleDevice.cs b/App/Modules/SicModules/PMs/PMModuleDevice.cs
index 1afc1d8..e86dbc9 100644
--- a/App/Modules/SicModules/PMs/PMModuleDevice.cs
+++ b/App/Modules/SicModules/PMs/PMModuleDevice.cs
@@ -1147,11 +1147,11 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.M1to16)
{
- lst = new List() { 1, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 16, 30 };//新增 30
+ lst = new List() { 1, 3, 4, 6, 7, 8, 10, 11, 12, 13, 14, 16};//新增 30
}
else if (mGroupName == MfcGroupName.M1toM17)
{
- lst = new List() { 1, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 16, 17 };
+ lst = new List() { 1, 3, 4, 6, 7, 8, 10, 11, 12, 13, 14, 16, 17 };
}
else if (mGroupName == MfcGroupName.M18toM40No303439)
{
@@ -1183,7 +1183,7 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.M2toM42)
{
- lst = new List() { 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() { 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 32, 33, 35, 36, 37, 38, 40 };
}
else if (mGroupName == MfcGroupName.M2toM40NoFinal1MFC)
{
diff --git a/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs
index a33cd2f..634bc95 100644
--- a/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs
+++ b/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs
@@ -173,8 +173,8 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.VentPumpClose, IoGroupName.VentPump, false, _IoValueOpenCloseTimeout);
SetIoValueByGroup((int)RoutineStep.SetGroupV25, IoGroupName.V25, true, _IoValueOpenCloseTimeout);
//打开V103,关闭V105
- SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout);
- SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout);
+ //SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout);
+ //SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout);
//打开V31,打开V32
SetIoValueByGroup((int)RoutineStep.SetV31, IoGroupName.V31, true, _IoValueOpenCloseTimeout);
@@ -216,7 +216,7 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.SetGroupJ, IoGroupName.J, true, _IoValueOpenCloseTimeout);
//打开V65
- SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout);
+ //SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout);
//打开EPV2
SetIoValueByGroup((int)RoutineStep.SetEPV2, IoGroupName.EPV2, true, _IoValueOpenCloseTimeout);
diff --git a/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs
index d4e062c..0ca4c5b 100644
--- a/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs
+++ b/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs
@@ -173,9 +173,9 @@ namespace SicModules.PMs.Routines
//关闭V72,打开V25
SetIoValueByGroup((int)RoutineStep.VentPumpClose, IoGroupName.VentPump, false, _IoValueOpenCloseTimeout);
SetIoValueByGroup((int)RoutineStep.SetGroupV25, IoGroupName.V25, true, _IoValueOpenCloseTimeout);
- //打开V103,关闭V105
- SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout);
- SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout);
+ ////打开V103,关闭V105
+ //SetIoValueByGroup((int)RoutineStep.SetV103, IoGroupName.V103, true, _IoValueOpenCloseTimeout);
+ //SetIoValueByGroup((int)RoutineStep.SetV105, IoGroupName.V105, false, _IoValueOpenCloseTimeout);
//打开V31,打开V32
SetIoValueByGroup((int)RoutineStep.SetV31, IoGroupName.V31, true, _IoValueOpenCloseTimeout);
@@ -217,7 +217,7 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.SetGroupJ, IoGroupName.J, true, _IoValueOpenCloseTimeout);
//打开V65
- SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout);
+ //SetIoValueByGroup((int)RoutineStep.SetV65, IoGroupName.V65, true, _IoValueOpenCloseTimeout);
//打开EPV2
SetIoValueByGroup((int)RoutineStep.SetEPV2, IoGroupName.EPV2, true, _IoValueOpenCloseTimeout);
diff --git a/App/SicRT/Equipments/AutoTransfer.cs b/App/SicRT/Equipments/AutoTransfer.cs
index a8ef5f5..b0189d6 100644
--- a/App/SicRT/Equipments/AutoTransfer.cs
+++ b/App/SicRT/Equipments/AutoTransfer.cs
@@ -1103,7 +1103,7 @@ namespace SicRT.Modules
{
//条件满足状态由AutoRunning切换到AutoIdle状态
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))
{
return true;
diff --git a/App/SicUI/Controls/Mainframe/M2C4EFEMView2.xaml b/App/SicUI/Controls/Mainframe/M2C4EFEMView2.xaml
index 2e681af..269f55a 100644
--- a/App/SicUI/Controls/Mainframe/M2C4EFEMView2.xaml
+++ b/App/SicUI/Controls/Mainframe/M2C4EFEMView2.xaml
@@ -138,7 +138,7 @@
Canvas.Top="503"
Width="83"
Height="8"
- IsDoorOpen="{Binding IsLLDoorOpen}"
+ IsDoorOpen="{Binding IsLoadLeftSlitValveOpen}"
RenderTransformOrigin="0.5,0.5">
diff --git a/App/SicUI/Models/Maintenances/TM/TMViewModel.cs b/App/SicUI/Models/Maintenances/TM/TMViewModel.cs
index 9a05e31..9d423e9 100644
--- a/App/SicUI/Models/Maintenances/TM/TMViewModel.cs
+++ b/App/SicUI/Models/Maintenances/TM/TMViewModel.cs
@@ -286,7 +286,7 @@ namespace SicUI.Client.Models.Platform.TM
//private List _modules = new List() { "PM1", "PM2", "LoadLock", "UnLoad", "Buffer.01", "Buffer.02", "Buffer.03" };
- private List _modules = new List() { "PM1", "PM2", "LoadLock", "Buffer.01", "Buffer.02", "Buffer.03" };
+ private List _modules = new List() { "PM1", "PM2", "LoadLock", "Buffer.01" };
public List Modules
{
get { return _modules; }