Compare commits
7 Commits
Author | SHA1 | Date |
---|---|---|
SIC1016\caipeilun | 140f378ede | |
SIC1016\caipeilun | 4dffed2e5f | |
SIC1016\caipeilun | e2b7653d56 | |
SIC1016\caipeilun | 78582fc288 | |
hanqiangqiang | 9ccf64ca9f | |
hanqiangqiang | ff0129730e | |
SIC1016\caipeilun | 74e1b6043e |
|
@ -363,6 +363,7 @@
|
|||
<IoSensor id="SensorTransformerOTSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_TransformerOTSW" infoText="" warningText="Warning12 TransformerOverTemp [DI-83]" alarmText="" />
|
||||
<IoSensor id="SensorSHLidClosed" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_SHLidClosed" infoText="" warningText="Warning13 SH Lid Opened [DI-106]" alarmText="" />
|
||||
<IoSensor id="SensorMiddleLidClosed" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_MiddleLidClosed" infoText="" warningText="Warning14 Middle Lid Opened [DI-120]" alarmText="" />
|
||||
<IoSensor id="SensorTMPumpFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_TMPumpFlowSW" infoText="" warningText="Warning15 TMPump1 Cooling Water Low Flow -U11 [DI-24]" alarmText="" />
|
||||
<IoSensor id="SensorPSUInnerTempHAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUInnerTempHAlarm" infoText="" warningText="Warning22 PSU Inner.Temp High [DI-305]" alarmText="" />
|
||||
<IoSensor id="SensorPSUMiddleTempHAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUMiddleTempHAlarm" infoText="" warningText="Warning23 PSU Middle.Temp High [DI-306]" alarmText="" />
|
||||
<IoSensor id="SensorPSUOuterTempHAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUOuterTempHAlarm" infoText="" warningText="Warning24 PSU Outer.Temp High [DI-307]" alarmText="" />
|
||||
|
@ -383,7 +384,7 @@
|
|||
<IoSensor id="SensorPowerRod2FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PowerRod2FlowSW" infoText="" warningText="" alarmText="Alarm10 Power Rod2 Cooling Water Low Flow -U8 [DI-21]" />
|
||||
<IoSensor id="SensorForeline2FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Foreline2FlowSW" infoText="" warningText="" alarmText="Alarm11 Foreline2 Cooling Water Low Flow -U9 [DI-22]" />
|
||||
<IoSensor id="SensorElectrodeWFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ElectrodeWFlowSW" infoText="" warningText="" alarmText="Alarm12 Electrode-W Cooling Water Low Flow -U10 [DI-23]" />
|
||||
<IoSensor id="SensorTMPumpFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_TMPumpFlowSW" infoText="" warningText="" alarmText="Alarm13 TMPump1 Cooling Water Low Flow -U11 [DI-24]" />
|
||||
|
||||
<IoSensor id="SensorTransformerFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_TransformerFlowSW" infoText="" warningText="" alarmText="Alarm14 Transformer Cooling Water Low Flow -U14 [DI-25]" />
|
||||
<IoSensor id="SensorSpare1FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Spare1FlowSW" infoText="" warningText="" alarmText="Alarm15 Spare1 Flow Low-U12 [DI-26]" />
|
||||
<IoSensor id="SensorInletTotalFlowLowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_InletTotalFlowLowSW" infoText="" warningText="" alarmText="Alarm16 Chamber Cooling Water Pressure Low [DI-27]" />
|
||||
|
|
|
@ -365,6 +365,7 @@
|
|||
<IoSensor id="SensorTransformerOTSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_TransformerOTSW" infoText="" warningText="Warning12 TransformerOverTemp [DI-83]" alarmText="" />
|
||||
<IoSensor id="SensorSHLidClosed" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_SHLidClosed" infoText="" warningText="Warning13 SH Lid Opened [DI-106]" alarmText="" />
|
||||
<IoSensor id="SensorMiddleLidClosed" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_MiddleLidClosed" infoText="" warningText="Warning14 Middle Lid Opened [DI-120]" alarmText="" />
|
||||
<IoSensor id="SensorTMPumpFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Spare1FlowSW" infoText="" warningText="Warning15 Spare1 Flow Low -U11 [DI-24]" alarmText="" />
|
||||
<IoSensor id="SensorPSUInnerTempHAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUInnerTempHAlarm" infoText="" warningText="Warning22 PSU Inner.Temp High [DI-305]" alarmText="" />
|
||||
<IoSensor id="SensorPSUMiddleTempHAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUMiddleTempHAlarm" infoText="" warningText="Warning23 PSU Middle.Temp High [DI-306]" alarmText="" />
|
||||
<IoSensor id="SensorPSUOuterTempHAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUOuterTempHAlarm" infoText="" warningText="Warning24 PSU Outer.Temp High [DI-307]" alarmText="" />
|
||||
|
@ -385,7 +386,7 @@
|
|||
<IoSensor id="SensorPowerRod2FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PowerRod2FlowSW" infoText="" warningText="" alarmText="Alarm10 Power Rod2 Cooling Water Low Flow -U8 [DI-21]" />
|
||||
<IoSensor id="SensorForeline2FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Foreline2FlowSW" infoText="" warningText="" alarmText="Alarm11 Foreline2 Cooling Water Low Flow -U9 [DI-22]" />
|
||||
<IoSensor id="SensorElectrodeWFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ElectrodeWFlowSW" infoText="" warningText="" alarmText="Alarm12 Electrode-W Cooling Water Low Flow -U10 [DI-23]" />
|
||||
<IoSensor id="SensorTMPumpFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Spare1FlowSW" infoText="" warningText="" alarmText="Alarm13 Spare1 Flow Low -U11 [DI-24]" />
|
||||
|
||||
<IoSensor id="SensorTransformerFlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_TransformerFlowSW" infoText="" warningText="" alarmText="Alarm14 Transformer Cooling Water Low Flow -U14 [DI-25]" />
|
||||
<IoSensor id="SensorSpare1FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Spare2FlowSW" infoText="" warningText="" alarmText="Alarm15 Spare2 Flow Low-U12 [DI-26]" />
|
||||
<IoSensor id="SensorInletTotalFlowLowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_InletTotalFlowLowSW" infoText="" warningText="" alarmText="Alarm16 Chamber Cooling Water Pressure Low [DI-27]" />
|
||||
|
|
|
@ -482,6 +482,7 @@ namespace SicModules.PMs
|
|||
{
|
||||
DATA.Subscribe($"{Module}.Status", () => StringFsmStatus.Replace("0", "").Replace("1", "").Replace("2", ""));
|
||||
DATA.Subscribe($"{Module}.IsOnline", () => IsOnline);
|
||||
DATA.Subscribe($"{Module}.IsProcessing", () => IsProcessing);
|
||||
DATA.Subscribe($"{Module}.IsService", () => IsServiceIdle);
|
||||
DATA.Subscribe($"{Module}.DI206EqualsTrue_OR_DO177EqualsTrue", () => DI206EqualsTrue_OR_DO177EqualsTrue, SubscriptionAttribute.FLAG.IgnoreSaveDB);
|
||||
|
||||
|
@ -493,7 +494,6 @@ namespace SicModules.PMs
|
|||
|
||||
DATA.Subscribe($"{Module}.WaferSize", () => WaferManager.Instance.GetWaferSize(_module, 0).ToString());
|
||||
|
||||
|
||||
DATA.Subscribe($"{Name}.LeakCheckElapseTime", () =>
|
||||
{
|
||||
if (FsmState == (int)STATE.LeakCheck)
|
||||
|
|
|
@ -704,13 +704,13 @@ namespace SicModules.PMs.RecipeExecutions
|
|||
if (!_hasRecordRunTime)
|
||||
{
|
||||
_hasRecordRunTime = true;
|
||||
RuntimeDataRecorder.UpdateElapseTimePM(Module + " Process",
|
||||
(int)(_recipeTimer.GetElapseTime() / 60000));
|
||||
}
|
||||
RuntimeDataRecorder.UpdateElapseTimePM(Module,
|
||||
(int)_recipeTimer.GetElapseTime() / 1000);
|
||||
}
|
||||
|
||||
_recipeTimer.Stop();
|
||||
Notify("Finished");
|
||||
GrowCheck();
|
||||
//GrowCheck();
|
||||
return Result.DONE;
|
||||
}
|
||||
|
||||
|
@ -720,10 +720,10 @@ namespace SicModules.PMs.RecipeExecutions
|
|||
if (!_hasRecordRunTime)
|
||||
{
|
||||
_hasRecordRunTime = true;
|
||||
RuntimeDataRecorder.UpdateElapseTimePM(Module + " Process",
|
||||
(int)(_recipeTimer.GetElapseTime() / 60000));
|
||||
}
|
||||
GrowCheck();
|
||||
RuntimeDataRecorder.UpdateElapseTimePM(Module,
|
||||
(int)_recipeTimer.GetElapseTime() / 1000);
|
||||
}
|
||||
//GrowCheck();
|
||||
return Result.DONE;
|
||||
}
|
||||
default:
|
||||
|
@ -808,8 +808,7 @@ namespace SicModules.PMs.RecipeExecutions
|
|||
if (!_hasRecordRunTime)
|
||||
{
|
||||
_hasRecordRunTime = true;
|
||||
RuntimeDataRecorder.UpdateElapseTimePM(Module + " Process",
|
||||
(int)(_recipeTimer.GetElapseTime() / 60000));
|
||||
RuntimeDataRecorder.UpdateElapseTimePM(Module,(int)_recipeTimer.GetElapseTime() / 1000);
|
||||
}
|
||||
|
||||
_state = RecipeRunningState.RecipeCompleted;
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
Recipe.Behaviour.AllowSaveInProcessView,3;Recipe.Behaviour.AllowRipInProcessView,3;Step1,3;Step2,3;Step3,3;Step4,3;Step5,3;Step6,3;Step7,3;Step8,3;Step9,3;
|
||||
Step10,3;Step11,3;Step12,3;Step13,3;Step14,3;Step15,3;Step16,3;Step17,3;Step18,3;Step19,3;Step20,3;Step21,3;Step22,3;Step23,3;Step24,3;Step25,3;Step26,3;
|
||||
Step27,3;Step28,3;Step29,3;Step30,3;Step31,3;Step32,3;Step33,3;Step34,3;Step35,3;Step36,3;Step37,3;Step38,3;Step39,3;Step40,3;Step41,3;Step42,3;Step43,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;Schedule,3;Monthly,3;Quarter,3;Annual,3;MaintainConfig,3;MaintainEvent,3;
|
||||
</roleItem>
|
||||
<roleItem id="1" name="Engineer" autologout="1" logouttime="20" buildin="true">
|
||||
Header,3;Overview,3;Coating,3;TM,3;Device,3;ioPlatform,3;LeakCheck,3;Sequence,3;Recipe,3;EventLog,3;ProcessHistory,3;RealTimeCharting,3;DataHistory,3;JobList,3;
|
||||
|
@ -52,7 +52,7 @@
|
|||
Recipe.Behaviour.AllowSaveInProcessView,3;Recipe.Behaviour.AllowRipInProcessView,3;Step1,3;Step2,3;Step3,3;Step4,3;Step5,3;Step6,3;Step7,3;Step8,3;Step9,3;
|
||||
Step10,3;Step11,3;Step12,3;Step13,3;Step14,3;Step15,3;Step16,3;Step17,3;Step18,3;Step19,3;Step20,3;Step21,3;Step22,3;Step23,3;Step24,3;Step25,3;Step26,3;
|
||||
Step27,3;Step28,3;Step29,3;Step30,3;Step31,3;Step32,3;Step33,3;Step34,3;Step35,3;Step36,3;Step37,3;Step38,3;Step39,3;Step40,3;Step41,3;Step42,3;Step43,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;Schedule,3;Monthly,3;Quarter,3;Annual,3;MaintainConfig,3;MaintainEvent,3;
|
||||
</roleItem>
|
||||
<roleItem id="2" name="Technician" autologout="1" logouttime="20" buildin="true">
|
||||
Header,3;Overview,3;Coating,3;TM,3;Device,3;ioPlatform,3;LeakCheck,3;Sequence,3;Recipe,3;EventLog,3;ProcessHistory,3;RealTimeCharting,3;DataHistory,3;JobList,3;
|
||||
|
@ -78,7 +78,7 @@
|
|||
Recipe.Behaviour.AllowSaveInProcessView,3;Recipe.Behaviour.AllowRipInProcessView,3;Step1,3;Step2,3;Step3,3;Step4,3;Step5,3;Step6,3;Step7,3;Step8,3;Step9,3;
|
||||
Step10,3;Step11,3;Step12,3;Step13,3;Step14,3;Step15,3;Step16,3;Step17,3;Step18,3;Step19,3;Step20,3;Step21,3;Step22,3;Step23,3;Step24,3;Step25,3;Step26,3;
|
||||
Step27,3;Step28,3;Step29,3;Step30,3;Step31,3;Step32,3;Step33,3;Step34,3;Step35,3;Step36,3;Step37,3;Step38,3;Step39,3;Step40,3;Step41,3;Step42,3;Step43,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;Schedule,3;Monthly,3;Quarter,3;Annual,3;MaintainConfig,3;MaintainEvent,3;
|
||||
</roleItem>
|
||||
<roleItem id="3" name="Operator" autologout="1" logouttime="20" buildin="true">
|
||||
Header,3;Overview,3;Coating,3;TM,3;Device,3;ioPlatform,3;LeakCheck,3;Sequence,3;Recipe,3;EventLog,3;ProcessHistory,3;RealTimeCharting,3;DataHistory,3;JobList,3;
|
||||
|
@ -104,7 +104,7 @@
|
|||
Recipe.Behaviour.AllowSaveInProcessView,3;Recipe.Behaviour.AllowRipInProcessView,3;Step1,3;Step2,3;Step3,3;Step4,3;Step5,3;Step6,3;Step7,3;Step8,3;Step9,3;
|
||||
Step10,3;Step11,3;Step12,3;Step13,3;Step14,3;Step15,3;Step16,3;Step17,3;Step18,3;Step19,3;Step20,3;Step21,3;Step22,3;Step23,3;Step24,3;Step25,3;Step26,3;
|
||||
Step27,3;Step28,3;Step29,3;Step30,3;Step31,3;Step32,3;Step33,3;Step34,3;Step35,3;Step36,3;Step37,3;Step38,3;Step39,3;Step40,3;Step41,3;Step42,3;Step43,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;
|
||||
Step44,3;Step45,3;Step46,3;Step47,3;Step48,3;Step49,3;Step50,3;Schedule,3;Monthly,3;Quarter,3;Annual,3;MaintainConfig,3;MaintainEvent,3;
|
||||
</roleItem>
|
||||
</roles>
|
||||
|
||||
|
|
|
@ -504,26 +504,46 @@ begin
|
|||
end if;
|
||||
------------------------------------------------------------------------------------------------
|
||||
--
|
||||
if not exists(select * from information_schema.tables
|
||||
if not exists(select * from information_schema.tables
|
||||
where
|
||||
table_catalog = CURRENT_CATALOG and table_schema = CURRENT_SCHEMA
|
||||
and table_name = 'pm_thickness_data2') then
|
||||
|
||||
CREATE TABLE pm_thickness_data2
|
||||
(
|
||||
"startdate" text NOT NULL,
|
||||
"pm_name" text ,
|
||||
"thickness" real
|
||||
)
|
||||
WITH (
|
||||
OIDS=FALSE
|
||||
);
|
||||
ALTER TABLE pm_thickness_data2
|
||||
OWNER TO postgres;
|
||||
GRANT SELECT ON TABLE pm_thickness_data2 TO postgres;
|
||||
end if;
|
||||
------------------------------------------------------------------------------------------------
|
||||
------------------------------------------------------------------------------------------------
|
||||
--
|
||||
if not exists(select * from information_schema.tables
|
||||
where
|
||||
table_catalog = CURRENT_CATALOG and table_schema = CURRENT_SCHEMA
|
||||
and table_name = 'pm_thickness_data') then
|
||||
|
||||
CREATE TABLE pm_thickness_data
|
||||
(
|
||||
|
||||
"pm_guid" text NOT NULL,
|
||||
"pm_minor_cycle" text ,
|
||||
"pm_major_cycle" text,
|
||||
CREATE TABLE pm_thickness_data
|
||||
(
|
||||
"pm_guid" text NOT NULL,
|
||||
"pm_minor_cycle" text ,
|
||||
"pm_major_cycle" text,
|
||||
|
||||
CONSTRAINT "pm_thickness_data_pkey" PRIMARY KEY ("pm_guid" )
|
||||
)
|
||||
WITH (
|
||||
OIDS=FALSE
|
||||
);
|
||||
ALTER TABLE pm_thickness_data
|
||||
OWNER TO postgres;
|
||||
GRANT SELECT ON TABLE pm_thickness_data TO postgres;
|
||||
CONSTRAINT "pm_thickness_data_pkey" PRIMARY KEY ("pm_guid" )
|
||||
)
|
||||
WITH (
|
||||
OIDS=FALSE
|
||||
);
|
||||
ALTER TABLE pm_thickness_data
|
||||
OWNER TO postgres;
|
||||
GRANT SELECT ON TABLE pm_thickness_data TO postgres;
|
||||
end if;
|
||||
------------------------------------------------------------------------------------------------
|
||||
--
|
||||
|
@ -825,6 +845,24 @@ if not exists(select * from information_schema.tables
|
|||
end if;
|
||||
------------------------------------------------------------------------------------------------
|
||||
|
||||
if not exists(select * from information_schema.tables
|
||||
where
|
||||
table_catalog = CURRENT_CATALOG and table_schema = CURRENT_SCHEMA
|
||||
and table_name = 'runtime_data2') then
|
||||
|
||||
CREATE TABLE runtime_data2
|
||||
(
|
||||
"Module" text ,
|
||||
"Process_Seconds" integer
|
||||
)
|
||||
WITH (
|
||||
OIDS=FALSE
|
||||
);
|
||||
ALTER TABLE runtime_data2
|
||||
OWNER TO postgres;
|
||||
GRANT SELECT ON TABLE runtime_data2 TO postgres;
|
||||
end if;
|
||||
------------------------------------------------------------------------------------------------
|
||||
if not exists(select * from information_schema.tables
|
||||
where
|
||||
table_catalog = CURRENT_CATALOG and table_schema = CURRENT_SCHEMA
|
||||
|
@ -833,12 +871,12 @@ if not exists(select * from information_schema.tables
|
|||
CREATE TABLE runtime_data
|
||||
(
|
||||
"guid" text ,
|
||||
"device_name" text ,
|
||||
"set_minutes" integer,
|
||||
"elapse_minutes" integer,
|
||||
"ispm" boolean,
|
||||
"device_name" text ,
|
||||
"set_minutes" integer,
|
||||
"elapse_minutes" integer,
|
||||
"ispm" boolean,
|
||||
|
||||
CONSTRAINT runtime_data_pkey PRIMARY KEY ("guid" )
|
||||
CONSTRAINT runtime_data_pkey PRIMARY KEY ("guid" )
|
||||
)
|
||||
WITH (
|
||||
OIDS=FALSE
|
||||
|
|
|
@ -68,5 +68,13 @@
|
|||
<menuItem id="MFCFlowPM2" resKey="MFCFlow" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcDynamicFlowViewModel,SicUI" />
|
||||
<menuItem id="MfcRorPM2" resKey="MfcRor" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcRorViewModel,SicUI" />
|
||||
</menuItem>
|
||||
|
||||
|
||||
<menuItem id="Maintainance" resKey="Maintainance">
|
||||
<menuItem id="Schedule" resKey="Schedule" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainViewModel,MECF.Framework.UI.Client" />
|
||||
<menuItem id="Monthly" resKey="Monthly" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainViewModel,MECF.Framework.UI.Client" />
|
||||
<menuItem id="Quarter" resKey="Quarter" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainViewModel,MECF.Framework.UI.Client" />
|
||||
<menuItem id="Annual" resKey="Annual" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainViewModel,MECF.Framework.UI.Client" />
|
||||
<menuItem id="MaintainConfig" resKey="Config" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainConfigViewModel,MECF.Framework.UI.Client" />
|
||||
<menuItem id="MaintainEvent" resKey="Maintain Event" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainEventViewModel,MECF.Framework.UI.Client" />
|
||||
</menuItem>
|
||||
</menu>
|
|
@ -24,6 +24,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="SingleSessionLoginMode" description="是否启用单会话登录模式,即同一个账户同一时间仅允许一个UI登录" max="" min="" paramter="" tag="" unit="" type="Bool" />
|
||||
<config default="false" name="IgnoreMaintainTimeOutWarning" description="维护界面是否忽略Warning提示" max="" min="" paramter="" tag="" unit="" type="Bool" />
|
||||
|
||||
<configs name="Scheduler" visible="false">
|
||||
<config default="15" name="WaitLoadTimeOut" description="Wait Load TimeOut" max="1000" min="1" paramter="" tag="" unit="s" type="Double" visible="false" />
|
||||
|
|
|
@ -24,6 +24,7 @@ using SicRT.Equipments.Systems;
|
|||
using SicModules.PMs.RecipeExecutions;
|
||||
using MECF.Framework.UI.Client.TrayThickness.HistoryData;
|
||||
using MECF.Framework.Common.Aitex.Core.Common.DeviceData;
|
||||
using MECF.Framework.Common.Aitex.Core.RT.EMS;
|
||||
|
||||
namespace SicRT.Instances
|
||||
{
|
||||
|
@ -98,8 +99,9 @@ namespace SicRT.Instances
|
|||
if (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM2].IsInstalled)
|
||||
IoManager.Instance.Initialize($"{PathManager.GetCfgDir()}pm\\pm2\\interlockPM2.xml");
|
||||
|
||||
Singleton<ProcessHistoryItemsDefault>.Instance.Initialize();
|
||||
MaintainManager2.Instance.Initialize();
|
||||
|
||||
Singleton<ProcessHistoryItemsDefault>.Instance.Initialize();
|
||||
|
||||
//! DataCollectionManager必须在最后初始化,否则在其之后注册的DATA数据均会被忽略
|
||||
Singleton<DataCollectionManager>.Instance.Initialize();
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -237,6 +237,17 @@
|
|||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Maintain\Maintain.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<Resource Include="Maintain\x1.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
<Resource Include="Maintain\x2.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
|
|
|
@ -18,6 +18,7 @@ using Aitex.Core.WCF;
|
|||
using CommandLine;
|
||||
using MECF.Framework.UI.Client.ClientBase;
|
||||
using SciChart.Charting.Visuals;
|
||||
using MECF.Framework.UI.Client.CenterViews.Maintain;
|
||||
|
||||
namespace SicUI.Client
|
||||
{
|
||||
|
@ -237,6 +238,8 @@ namespace SicUI.Client
|
|||
return;
|
||||
}
|
||||
|
||||
MaintainProvider2.Instance.Initialize();
|
||||
|
||||
BaseApp.Instance.Initialize();
|
||||
|
||||
_splashScreen?.SetMessage1("Preparing Environment ...");
|
||||
|
|
|
@ -52,12 +52,13 @@ namespace SicUI.Client
|
|||
private readonly IEventAggregator _eventAggregator;
|
||||
private readonly IProgress<Credential> _prgShowLoginRequestConfirmDialog;
|
||||
private CancellationTokenSource _ctsLoginRequestConfirmDialog;
|
||||
private readonly IWindowManager _windowmanager;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Constructors
|
||||
|
||||
public MainViewModel(IEventAggregator eventAggregator)
|
||||
public MainViewModel(IEventAggregator eventAggregator, IWindowManager wmr)
|
||||
{
|
||||
((ClientApp)BaseApp.Instance).ViewModelSwitcher = this;
|
||||
_models = new Dictionary<Type, BaseModel>();
|
||||
|
@ -86,6 +87,7 @@ namespace SicUI.Client
|
|||
_prgShowLoginRequestConfirmDialog = new Progress<Credential>(ShowLoginRequestConfirmDialog);
|
||||
|
||||
Reset();
|
||||
_windowmanager = wmr;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
@ -728,9 +730,8 @@ namespace SicUI.Client
|
|||
{
|
||||
if (!IsReadOnlyMode)
|
||||
{
|
||||
var windowManager = new WindowManager();
|
||||
var logoffViewmodel = new LogoffViewModel();
|
||||
windowManager.ShowDialog(logoffViewmodel);
|
||||
_windowmanager.ShowDialog(logoffViewmodel);
|
||||
|
||||
BaseApp.Instance.UserMode = logoffViewmodel.DialogResult;
|
||||
|
||||
|
@ -819,6 +820,28 @@ namespace SicUI.Client
|
|||
base.OnInitialize();
|
||||
StartTimer();
|
||||
|
||||
ConfigChangeCheck();
|
||||
MaintainanceCheck();
|
||||
|
||||
if (Debugger.IsAttached)
|
||||
{
|
||||
RequestLogin("admin", new PasswordBox() { Password = "admin" }, new Role("0", "Manager", false, 1000, null));
|
||||
}
|
||||
}
|
||||
|
||||
private void MaintainanceCheck()
|
||||
{
|
||||
string info = (string)QueryDataClient.Instance.Service.GetData("MaintainManager.MaintainanceCheck");
|
||||
|
||||
if (info != "")
|
||||
{
|
||||
DialogBox.ShowInfo("There are UnMaintainItems in Plan\r\n" + info
|
||||
+ "please check as soon as possible.");
|
||||
}
|
||||
}
|
||||
|
||||
private void ConfigChangeCheck()
|
||||
{
|
||||
List<ConfigChangedInfo> s = (List<ConfigChangedInfo>)QueryDataClient.Instance.Service.GetConfig("SystemConfig.DataChangedList");
|
||||
if (s != null && s.Count > 0)
|
||||
{
|
||||
|
@ -840,10 +863,6 @@ namespace SicUI.Client
|
|||
}
|
||||
}
|
||||
|
||||
if (Debugger.IsAttached)
|
||||
{
|
||||
RequestLogin("admin", new PasswordBox() { Password = "admin" }, new Role("0", "Manager", false, 1000, null));
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnActivate()
|
||||
|
@ -944,6 +963,7 @@ namespace SicUI.Client
|
|||
{
|
||||
menuViewItem.Model = (BaseModel)AssemblyUtil.CreateInstance(AssemblyUtil.GetType(menuViewItem.ViewModel));
|
||||
((BaseModel)menuViewItem.Model).Permission = menuViewItem.Permission;
|
||||
((BaseModel)menuViewItem.Model).DisplayName = menuViewItem.ResKey; //将名称传入viewmodel中
|
||||
// ((BaseModel)menuViewItem.Model).Token = BaseApp.Instance.UserContext.Token;
|
||||
|
||||
if (menuViewItem.Model is ISupportMultipleSystem smsViewModel)
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue