add - hsl通讯展示界面 性能待优化

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MemoryCacheHelper.cs

@@ -0,0 +1 @@
+

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj

@@ -186,6 +186,7 @@
       <HintPath>..\..\..\packages\System.Data.SqlClient.4.8.5\lib\net451\System.Data.SqlClient.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -500,6 +501,8 @@
       <DependentUpon>Loading.cs</DependentUpon>
     </Compile>
     <Compile Include="LoadingHelper.cs" />
+    <Compile Include="MainDetailControl\MainDetailControlAction.cs" />
+    <Compile Include="MainDetailControl\MemoryCacheHelper.cs" />
     <Compile Include="ManualControl\InitAction.cs" />
     <Compile Include="ManualControl\ManualLogEntity.cs" />
     <Compile Include="ManualControl\ManualControlAction.cs" />
@@ -891,10 +894,18 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Controls\Mesnac.Controls.ChemicalWeighing\Mesnac.Controls.ChemicalWeighing.csproj">
+      <Project>{B9B99759-8B95-4078-A5E9-A63E0E48384C}</Project>
+      <Name>Mesnac.Controls.ChemicalWeighing</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Controls\Mesnac.Controls.Default\Mesnac.Controls.Default.csproj">
       <Project>{f022c0e6-2819-4fb1-bb86-0f389f061a44}</Project>
       <Name>Mesnac.Controls.Default</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Controls\Mesnac.Controls.Feeding\Mesnac.Controls.Feeding.csproj">
+      <Project>{D0C0324F-434E-47EB-8F7C-BA6CD7F233B4}</Project>
+      <Name>Mesnac.Controls.Feeding</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\DataBlockHelper\DataBlockHelper.csproj">
       <Project>{4e36df17-e81d-4360-8687-8ad75422b470}</Project>
       <Name>DataBlockHelper</Name>

Controls/Mesnac.Controls.ChemicalWeighing/LjSwith.cs

@@ -44,8 +44,6 @@ namespace Mesnac.Controls.ChemicalWeighing
                 ReloadStream();
                 Reload();
             }
-               
-
         }
         
         private void ReloadStream()

DataBlockHelper/DBHelpers/DB2102Helper.cs

@@ -110,6 +110,13 @@ namespace DataBlockHelper.DBHelpers
         public FOR_VALVE_SingleEntity BUWeter6 => new FOR_VALVE_SingleEntity(192);
         public FOR_VALVE_SingleEntity BUWeter7 => new FOR_VALVE_SingleEntity(194);
         public FOR_VALVE_SingleEntity BUWeter8 => new FOR_VALVE_SingleEntity(196);
-
+        public FOR_VALVE_SingleEntity BU1GEB02 => new FOR_VALVE_SingleEntity(198);
+        public FOR_VALVE_SingleEntity BU2GEB02 => new FOR_VALVE_SingleEntity(200);
+        public FOR_VALVE_SingleEntity BU3GEB02 => new FOR_VALVE_SingleEntity(202);
+        public FOR_VALVE_SingleEntity BU4GEB02 => new FOR_VALVE_SingleEntity(204);
+        public FOR_VALVE_SingleEntity BU5GEB02 => new FOR_VALVE_SingleEntity(206);
+        public FOR_VALVE_SingleEntity BU6GEB02 => new FOR_VALVE_SingleEntity(208);
+        public FOR_VALVE_SingleEntity BU7GEB02 => new FOR_VALVE_SingleEntity(210);
+        public FOR_VALVE_SingleEntity BU8GEB02 => new FOR_VALVE_SingleEntity(212);
     }
 }

DataBlockHelper/PlcConnect.cs

@@ -31,8 +31,8 @@ namespace DataBlockHelper
         {
             SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
             SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
-            s7.IpAddress = "172.18.4.100";
+            s7.IpAddress = "192.168.0.100";
-            s7.Port = 102;
+            s7.Port = 7788;
             s7.ConnectServer();
             return s7;
         }

Main/MCEdit/Data/ComponentAction 2.xml

@@ -417,6 +417,7 @@
         <Propertys>
             <Property Name="AlarmName" Caption="故障状态" Group="开关" ControlPropertyName="Alarm"/>
             <Property Name="SetName" Caption="流通状态" Group="开关" ControlPropertyName="Set"/>
+			<Property Name="MCKey" Caption="业务标识" Group="业务" ControlPropertyName="Key"/>
         </Propertys>
     </Component>
     

Main/MCEdit/Data/ComponentAction.xml

@@ -429,6 +429,7 @@
         <Propertys>
             <Property Name="AlarmName" Caption="故障状态" Group="开关" ControlPropertyName="Alarm"/>
             <Property Name="SetName" Caption="流通状态" Group="开关" ControlPropertyName="Set"/>
+			<Property Name="MCKey" Caption="业务标识" Group="业务" ControlPropertyName="MCKey"/>
         </Propertys>
     </Component>
     

Main/MCEdit/Data/ComponentProperty.xml

@@ -1669,8 +1669,10 @@
         <Component Name="LjSwith" Namespace="Mesnac.Controls.ChemicalWeighing" Asm="Mesnac.Controls.ChemicalWeighing.dll">
     <Propertys>
         <Property Name="Location" Caption="位置" Group=""/>
+		<Property Name="DbOptionType" Caption="²Ù×÷ÀàÐÍ" Group=""/>
         <Property Name="Name" Caption="名称" Group=""/>
         <Property Name="Size" Caption="大小" Group=""/>
+		
     </Propertys>
     <DataBinding>
     </DataBinding>

Main/MCEdit/Data/EventConfig/小料称量/主要设备细节.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ActionService>
+    <Design>
+        <Path path="主要设备细节">
+            <Action action="9701D4972A2946F28A399331EB406379">
+              <Caption>界面初始化</Caption>
+              <Remark>界面初始化</Remark>
+            </Action>
+        </Path>
+    </Design>
+
+    <DesignToRuntime>
+        <Design action="9701D4972A2946F28A399331EB406379">
+          <Runtime action="FADABFD213F945CB82B099374004DAF3"/>
+        </Design>
+    </DesignToRuntime>
+
+    <Runtime>
+        <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
+          <Action action="FADABFD213F945CB82B099374004DAF3" class="Mesnac.Action.ChemicalWeighing.MainDetailControl.MainDetailControlAction"/>
+        </Import>
+    </Runtime>
+</ActionService>

Main/MCEdit/Data/MCProject/SCWSProject2.mprj

@@ -26,6 +26,7 @@
       <Node Name="FormOliveEQSetting" Text="榄菊设备参数" ToolTipText="FormOliveEQSetting" Tag="FormOliveEQSetting" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormLJRecipeData" Text="榄菊配方管理" ToolTipText="FormLJRecipeData" Tag="FormLJRecipeData" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="ManualWaterControl" Text="手动控制" ToolTipText="ManualControl" Tag="ManualWaterControl" ImageIndex="3" SelectedImageIndex="3" />
+      <Node Name="MainDetail" Text="设备细节画面" ToolTipText="MainDetail" Tag="MainDetail" ImageIndex="3" SelectedImageIndex="3" />
     </Node>
     <Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2">
       <Node Name="ParametersWithPc" Text="ParametersWithPc" ToolTipText="" Tag="ParametersWithPc" ImageIndex="5" SelectedImageIndex="5" />

Main/MCEdit/Data/MCProject/nodeDevice.xml

@@ -13,7 +13,7 @@
       </Connection>
     </Main>
     <Group>
-      <Group name="B1" block="2107" start="0" len="1032" access="ReadWrite" remark="ParametersWithPc" isautoread="True">
+      <Group name="B1" block="2107" start="0" len="1032" access="ReadWrite" remark="ParametersWithPc" isautoread="False">
         <Data>
           <Data name="FirstWord" runname="FirstWord" start="0" len="1" method="Default_Bit(0,1)" max="" issave="False" subtractor="" remark="FirstWord" />
           <Data name="WatchDog" runname="WatchDog" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="系统通用参数" />
@@ -2810,7 +2810,7 @@
           <Data name="wetMixingH_9_actTolerence" runname="wetMixingH_9_actTolerence" start="2822" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="称量误差" />
         </Data>
       </Group>
-      <Group name="RecipeDataFromPC" block="2104" start="0" len="1789" access="ReadWrite" remark="" isautoread="True">
+      <Group name="RecipeDataFromPC" block="2104" start="0" len="1789" access="ReadWrite" remark="" isautoread="False">
         <Data>
           <Data name="FirstWord" runname="FirstWord" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="预留" />
           <Data name="RecipeCode" runname="RecipeCode" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="配方代码" />
@@ -3958,7 +3958,7 @@
           <Data name="WeterM8Step9_Tolerance" runname="WeterM8Step9_Tolerance" start="1787" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="设定公差" />
         </Data>
       </Group>
-      <Group name="DB2102-valveInitDB" block="2102" start="0" len="107" access="ReadWrite" remark="valveInitDB" isautoread="True">
+      <Group name="DB2102-valveInitDB" block="2102" start="0" len="107" access="ReadWrite" remark="valveInitDB" isautoread="False">
         <Data>
           <Data name="BU1ASF01_ManualMode" runname="BU1ASF01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU1ASF01_AutoMode" runname="BU1ASF01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -5395,7 +5395,7 @@
           <Data name="BU8GEB02_P" runname="BU8GEB02_P" start="106" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
         </Data>
       </Group>
-      <Group name="DB2103-motorInitDB" block="2103" start="0" len="209" access="ReadWrite" remark="motorInitDB" isautoread="True">
+      <Group name="DB2103-motorInitDB" block="2103" start="0" len="209" access="ReadWrite" remark="motorInitDB" isautoread="False">
         <Data>
           <Data name="DM1ASI01_ManualMode" runname="DM1ASI01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="DM1ASI01_AutoMode" runname="DM1ASI01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />

Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml

@@ -304,12 +304,12 @@
           <Property name="MultiSelect">False</Property>
           <Property name="Location">10, 7</Property>
           <Property name="Name">MCDataGridView1</Property>
-          <Property name="Size">710, 181</Property>
+          <Property name="Size">710, 194</Property>
           <Property name="TabIndex">564</Property>
         </Object>
-        <Property name="Location">39, 344</Property>
+        <Property name="Location">39, 336</Property>
         <Property name="Name">MCPanelBlack4</Property>
-        <Property name="Size">732, 194</Property>
+        <Property name="Size">732, 204</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.MCPanelBlack, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCPanelBlack3" children="Controls">
         <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel778" children="Controls">
@@ -8226,13 +8226,6 @@
         <Property name="Name">LjSwith248</Property>
         <Property name="Size">14, 13</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith247" children="Controls">
-        <Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU4BLT07_Alarm</Property>
-        <Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU4BLT07_Set</Property>
-        <Property name="Location">593, 392</Property>
-        <Property name="Name">LjSwith247</Property>
-        <Property name="Size">14, 13</Property>
-      </Object>
       <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf97" children="Controls">
         <Property name="StatusName">ParametersWithPc.B1.AS4BLT03</Property>
         <Property name="Status">TurnOff</Property>

Main/MCEdit/MCEdit.csproj

@@ -222,6 +222,10 @@
     <Content Include="Data\EventConfig\小料称量\手动控制.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Data\EventConfig\小料称量\主要设备细节.xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Data\EventConfig\小料称量\设备细节报表.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -546,6 +550,7 @@
     <Content Include="Data\MCProject\nodeForm\DeviceParamManage.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Data\MCProject\nodeForm\MainDetail.xml" />
     <Content Include="Data\MCProject\nodeForm\监控主界面.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>