From 6168f16fbe874d814b71e56e9f4d170fccdbd86d Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Thu, 9 Jul 2026 17:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B0=94=E5=8A=A8=E9=98=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=95=8C=E9=9D=A2=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=91=E5=AE=9A=EF=BC=8C=E5=88=9D=E6=AD=A5?= =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=BF=E7=9C=9F=E9=85=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/PM/PM1/DeviceModelPM1.xml | 167 +++--- .../SicModules/Config/PM/PM1/_ioDefinePM1.xml | 6 +- .../SicModules/Config/PM/PM2/_ioDefinePM2.xml | 4 +- App/SicSimulator/Config/DevicePM.xml | 328 +++++++++++ App/SicSimulator/Config/DeviceTM.xml | 57 ++ App/SicSimulator/Config/_ioDefinePM.xml | 6 +- App/SicSimulator/Instances/SimulatorSystem.cs | 8 +- App/SicSimulator/SicSimulator.csproj | 8 + App/SicUI/Models/PMs/PMOperationViewModel.cs | 512 ++---------------- 9 files changed, 520 insertions(+), 576 deletions(-) create mode 100644 App/SicSimulator/Config/DevicePM.xml create mode 100644 App/SicSimulator/Config/DeviceTM.xml diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index 6992533..3520d62 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -2,100 +2,95 @@ - - - + + + - - - - + + + + - + + - - - - - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml index eb810cd..8526991 100644 --- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml @@ -142,7 +142,7 @@ - + @@ -192,8 +192,8 @@ - - + + diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index fce4e2f..c20be7d 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -192,8 +192,8 @@ - - + + diff --git a/App/SicSimulator/Config/DevicePM.xml b/App/SicSimulator/Config/DevicePM.xml new file mode 100644 index 0000000..ccb20e4 --- /dev/null +++ b/App/SicSimulator/Config/DevicePM.xml @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/SicSimulator/Config/DeviceTM.xml b/App/SicSimulator/Config/DeviceTM.xml new file mode 100644 index 0000000..321fb45 --- /dev/null +++ b/App/SicSimulator/Config/DeviceTM.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index eb810cd..8526991 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -142,7 +142,7 @@ - + @@ -192,8 +192,8 @@ - - + + diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs index 6da634c..0356aaa 100644 --- a/App/SicSimulator/Instances/SimulatorSystem.cs +++ b/App/SicSimulator/Instances/SimulatorSystem.cs @@ -28,15 +28,15 @@ namespace SicSimulator.Instances public void Initialize() { - SetDefaultValue("PM1"); - SetDefaultValue("PM2"); - SetTMDefaultValue("TM"); + //SetDefaultValue("PM1"); + //SetDefaultValue("PM2"); + //SetTMDefaultValue("TM"); //Singleton.Instance.Initialize(false); WcfServiceManager.Instance.Initialize(new Type[] { typeof(SimulatorAdsPlcService) }); - //Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DevicePM.xml", "GaN", ModuleName.PM1, "PM1"); + Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DevicePM.xml", "GaN", ModuleName.PM1, "PM1"); //Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DevicePM.xml", "GaN", ModuleName.PM2, "PM2"); //Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DeviceTM.xml", "GaN", ModuleName.TM, "TM"); diff --git a/App/SicSimulator/SicSimulator.csproj b/App/SicSimulator/SicSimulator.csproj index d843d8a..6370cbc 100644 --- a/App/SicSimulator/SicSimulator.csproj +++ b/App/SicSimulator/SicSimulator.csproj @@ -174,5 +174,13 @@ SimulatorCore + + + Always + + + Always + + \ No newline at end of file diff --git a/App/SicUI/Models/PMs/PMOperationViewModel.cs b/App/SicUI/Models/PMs/PMOperationViewModel.cs index 6e4bc3f..88c1da6 100644 --- a/App/SicUI/Models/PMs/PMOperationViewModel.cs +++ b/App/SicUI/Models/PMs/PMOperationViewModel.cs @@ -90,23 +90,9 @@ namespace SicUI.Models.PMs #region MFC - public double V90CountMFC => Mfc31Data.FeedBack + (V63.IsOpen ? Mfc25Data.FeedBack : 0) + (V62.IsOpen ? Mfc22Data.FeedBack : 0) + (V61.IsOpen ? Mfc19Data.FeedBack : 0); - public double V89CountMFC => Mfc29Data.FeedBack + (V63.IsOpen ? Mfc26Data.FeedBack : 0) + (V62.IsOpen ? Mfc23Data.FeedBack : 0) + (V61.IsOpen ? Mfc20Data.FeedBack : 0); - public double V88CountMFC => Mfc28Data.FeedBack + (V63.IsOpen ? Mfc15Data.FeedBack : 0) + (V62.IsOpen ? Mfc9Data.FeedBack : 0) + (V61.IsOpen ? Mfc2Data.FeedBack : 0); - //PT4Data.OpenDegree > 0 - public double ACountMFC => (V25.IsOpen || V72.IsOpen) ? - Mfc1Data.FeedBack + - (!V39.IsOpen ? Mfc6Data.FeedBack : 0) + - (!V40.IsOpen ? Mfc5Data.FeedBack : 0) + - (!V41.IsOpen && V42.IsOpen && (V43s.IsOpen || V45.IsOpen) && TMAEnable ? Mfc7Data.FeedBack : 0) + - (!V41.IsOpen && V42.IsOpen && TMAEnable ? Mfc8Data.FeedBack : 0) + - (!V53.IsOpen ? (Mfc12Data.FeedBack + (V49.IsOpen || V48s.IsOpen ? Mfc10Data.FeedBack + Mfc11Data.FeedBack : 0)) : 0) + - (!V54.IsOpen ? Mfc13Data.FeedBack : 0) + - (V56.IsOpen && !V55.IsOpen ? Mfc14Data.FeedBack : 0) + - (V60.IsOpen && !V59.IsOpen ? Mfc16Data.FeedBack : 0) - : 0; + //PT4Data.OpenDegree > public double BCountMFC => (V25.IsOpen || V72.IsOpen) ? Mfc3Data.FeedBack + Mfc4Data.FeedBack - Mfc6Data.FeedBack : 0;//PT1Data.OpenDegree > 0 ? Mfc3Data.FeedBack + Mfc4Data.FeedBack - Mfc6Data.FeedBack : 0; @@ -295,12 +281,35 @@ namespace SicUI.Models.PMs #region Valve + [Subscription("V18.DeviceData")] + public AITValveData V18 { get; set; } + + [Subscription("V18s.DeviceData")] + public AITValveData V18s { get; set; } [Subscription("V19.DeviceData")] public AITValveData V19 { get; set; } - [Subscription("V19s.DeviceData")] - public AITValveData V19s { get; set; } + [Subscription("V20.DeviceData")] + public AITValveData V20 { get; set; } + + [Subscription("V20s.DeviceData")] + public AITValveData V20s { get; set; } + + [Subscription("V21.DeviceData")] + public AITValveData V21 { get; set; } + + [Subscription("V21s.DeviceData")] + public AITValveData V21s { get; set; } + + [Subscription("V22.DeviceData")] + public AITValveData V22 { get; set; } + + [Subscription("V23.DeviceData")] + public AITValveData V23 { get; set; } + + [Subscription("V23s.DeviceData")] + public AITValveData V23s { get; set; } [Subscription("V25.DeviceData")] public AITValveData V25 { get; set; } @@ -308,9 +317,6 @@ namespace SicUI.Models.PMs [Subscription("V27.DeviceData")] public AITValveData V27 { get; set; } - [Subscription("V30.DeviceData")] - public AITValveData V30 { get; set; } - [Subscription("V31.DeviceData")] public AITValveData V31 { get; set; } @@ -335,9 +341,6 @@ namespace SicUI.Models.PMs [Subscription("V37s.DeviceData")] public AITValveData V37s { get; set; } - [Subscription("V38.DeviceData")] - public AITValveData V38 { get; set; } - [Subscription("V39.DeviceData")] public AITValveData V39 { get; set; } @@ -350,14 +353,9 @@ namespace SicUI.Models.PMs [Subscription("V40s.DeviceData")] public AITValveData V40s { get; set; } - [Subscription("V41.DeviceData")] public AITValveData V41 { get; set; } - [Subscription("V41s.DeviceData")] - public AITValveData V41s { get; set; } - - [Subscription("V42.DeviceData")] public AITValveData V42 { get; set; } @@ -367,11 +365,9 @@ namespace SicUI.Models.PMs [Subscription("V43s.DeviceData")] public AITValveData V43s { get; set; } - [Subscription("V45.DeviceData")] public AITValveData V45 { get; set; } - [Subscription("V46.DeviceData")] public AITValveData V46 { get; set; } @@ -390,7 +386,6 @@ namespace SicUI.Models.PMs [Subscription("V48s.DeviceData")] public AITValveData V48s { get; set; } - [Subscription("V49.DeviceData")] public AITValveData V49 { get; set; } @@ -406,7 +401,6 @@ namespace SicUI.Models.PMs [Subscription("V51s.DeviceData")] public AITValveData V51s { get; set; } - [Subscription("V52.DeviceData")] public AITValveData V52 { get; set; } @@ -431,37 +425,23 @@ namespace SicUI.Models.PMs [Subscription("V56.DeviceData")] public AITValveData V56 { get; set; } - [Subscription("V57.DeviceData")] - public AITValveData V57 { get; set; } - [Subscription("V58.DeviceData")] public AITValveData V58 { get; set; } [Subscription("V58s.DeviceData")] public AITValveData V58s { get; set; } - - [Subscription("V59.DeviceData")] public AITValveData V59 { get; set; } - [Subscription("V60.DeviceData")] - public AITValveData V60 { get; set; } + [Subscription("V59s.DeviceData")] + public AITValveData V59s { get; set; } - [Subscription("V61.DeviceData")] - public AITValveData V61 { get; set; } + [Subscription("V66.DeviceData")] + public AITValveData V66 { get; set; } - [Subscription("V62.DeviceData")] - public AITValveData V62 { get; set; } - - [Subscription("V63.DeviceData")] - public AITValveData V63 { get; set; } - - [Subscription("V64.DeviceData")] - public AITValveData V64 { get; set; } - - [Subscription("V65.DeviceData")] - public AITValveData V65 { get; set; } + [Subscription("V67.DeviceData")] + public AITValveData V67 { get; set; } [Subscription("V68.DeviceData")] public AITValveData V68 { get; set; } @@ -520,36 +500,11 @@ namespace SicUI.Models.PMs [Subscription("V97.DeviceData")] public AITValveData V97 { get; set; } - [Subscription("V111.DeviceData")] - public AITValveData V111 { get; set; } - - [Subscription("V99.DeviceData")] - public AITValveData V99 { get; set; } - - [Subscription("V99s.DeviceData")] - public AITValveData V99s { get; set; } - - [Subscription("V100.DeviceData")] - public AITValveData V100 { get; set; } - - [Subscription("V103.DeviceData")] - public AITValveData V103 { get; set; } - - [Subscription("V103s.DeviceData")] - public AITValveData V103s { get; set; } - - [Subscription("V105.DeviceData")] - public AITValveData V105 { get; set; } - - [Subscription("V105s.DeviceData")] - public AITValveData V105s { get; set; } - - + [Subscription("EPV1.DeviceData")] + public AITValveData EPV1 { get; set; } [Subscription("EPV2.DeviceData")] public AITValveData EPV2 { get; set; } - - #endregion #region Temp @@ -1097,406 +1052,7 @@ namespace SicUI.Models.PMs { get { return IsOnline; } } - #region MoveSpeed - private const double movespeed = 0; - public double V31MoveSpeed - { - get - { - if (V31.Feedback) return movespeed; - else return 0; - } - } - public double V32MoveSpeed - { - get - { - if (V32.Feedback) return movespeed; - else return 0; - } - } - public double V33MoveSpeed - { - get - { - if (V33.Feedback) return movespeed; - else return 0; - } - } - public double V33sMoveSpeed - { - get - { - if (V33s.Feedback) return movespeed; - else return 0; - } - } - public double V35MoveSpeed - { - get - { - if (V35.Feedback) return movespeed; - else return 0; - } - } - public double V36MoveSpeed - { - get - { - if (V36.Feedback) return movespeed; - else return 0; - } - } - public double V37sMoveSpeed - { - get - { - if (V37s.Feedback) return movespeed; - else return 0; - } - } - public double V37MoveSpeed - { - get - { - if (V37.Feedback) return movespeed; - else return 0; - } - } - - public double V43MoveSpeed - { - get - { - if (V43.Feedback) return movespeed; - else return 0; - } - } - public double V45MoveSpeed - { - get - { - if (V45.Feedback) return movespeed; - else return 0; - } - } - public double V46MoveSpeed - { - get - { - if (V46.Feedback) return movespeed; - else return 0; - } - } - public double V46sMoveSpeed - { - get - { - if (V46s.Feedback) return movespeed; - else return 0; - } - } - public double V46_46sMoveSpeed - { - get - { - if (V46.Feedback || V46s.Feedback) return movespeed; - else return 0; - } - } - public double V43sMoveSpeed - { - get - { - if (V43s.Feedback) return movespeed; - else return 0; - } - } - public double V48MoveSpeed - { - get - { - if (V48.Feedback) return movespeed; - else return 0; - } - } - public double V50MoveSpeed - { - get - { - if (V50.Feedback) return movespeed; - else return 0; - } - } - public double V50sMoveSpeed - { - get - { - if (V50s.Feedback) return movespeed; - else return 0; - } - } - public double V50_50sMoveSpeed - { - get - { - if (V50.Feedback || V50s.Feedback) return movespeed; - else return 0; - } - } - public double V49MoveSpeed - { - get - { - if (V49.Feedback) return movespeed; - else return 0; - } - } - public double V48sMoveSpeed - { - get - { - if (V48s.Feedback) return movespeed; - else return 0; - } - } - public double V51MoveSpeed - { - get - { - if (V51.Feedback) return movespeed; - else return 0; - } - } - public double V51sMoveSpeed - { - get - { - if (V51s.Feedback) return movespeed; - else return 0; - } - } - public double V51_51sMoveSpeed - { - get - { - if (V51.Feedback || V51s.Feedback) return movespeed; - else return 0; - } - } - public double V52MoveSpeed - { - get - { - if (V52.Feedback) return movespeed; - else return 0; - } - } - public double V52sMoveSpeed - { - get - { - if (V52s.Feedback) return movespeed; - else return 0; - } - } - public double V52_52sMoveSpeed - { - get - { - if (V52.Feedback || V52s.Feedback) return movespeed; - else return 0; - } - } - public double V58MoveSpeed - { - get - { - if (V58.Feedback) return movespeed; - else return 0; - } - } - public double V58sMoveSpeed - { - get - { - if (V58s.Feedback) return movespeed; - else return 0; - } - } - public double V58_58sMoveSpeed - { - get - { - if (V58.Feedback || V58s.Feedback) return movespeed; - else return 0; - } - } - public double V53sMoveSpeed - { - get - { - if (V53s.Feedback) return movespeed; - else return 0; - } - } - public double V54sMoveSpeed - { - get - { - if (V54s.Feedback) return movespeed; - else return 0; - } - } - public double V56MoveSpeed - { - get - { - if (V56.Feedback) return movespeed; - else return 0; - } - } - public double V60MoveSpeed - { - get - { - if (V60.Feedback) return movespeed; - else return 0; - } - } - public double V59MoveSpeed - { - get - { - if (V59.Feedback) return movespeed; - else return 0; - } - } - public double V53MoveSpeed - { - get - { - if (V53.Feedback) return movespeed; - else return 0; - } - } - public double V54MoveSpeed - { - get - { - if (V54.Feedback) return movespeed; - else return 0; - } - } - public double V55MoveSpeed - { - get - { - if (V55.Feedback) return movespeed; - else return 0; - } - } - public double V61MoveSpeed - { - get - { - if (V61.Feedback) return movespeed; - else return 0; - } - } - public double V62MoveSpeed - { - get - { - if (V62.Feedback) return movespeed; - else return 0; - } - } - public double V63MoveSpeed - { - get - { - if (V63.Feedback) return movespeed; - else return 0; - } - } - public double V62_63MoveSpeed - { - get - { - if (V62.Feedback || V63.Feedback) return movespeed; - else return 0; - } - } - public double V68MoveSpeed - { - get - { - if (V68.Feedback) return movespeed; - else return 0; - } - } - - public double V69MoveSpeed - { - get - { - if (V69.Feedback) return movespeed; - else return 0; - } - } - public double V70MoveSpeed - { - get - { - if (V70.Feedback) return movespeed; - else return 0; - } - } - public double V72MoveSpeed - { - get - { - if (V72.Feedback) return movespeed; - else return 0; - } - } - public double V73MoveSpeed - { - get - { - if (V73.Feedback) return movespeed; - else return 0; - } - } - public double V74MoveSpeed - { - get - { - if (V74.Feedback) return movespeed; - else return 0; - } - } - public double V75MoveSpeed - { - get - { - if (V75.Feedback) return movespeed; - else return 0; - } - } - public double V76MoveSpeed - { - get - { - if (V76.Feedback) return movespeed; - else return 0; - } - } - - - #endregion [IgnorePropertyChange] public string TVModeSetPoint