Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

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

@@ -153,6 +153,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Office.Interop.Excel">
+      <HintPath>..\..\Microsoft.Office.Interop.Excel.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/InitFormAction.cs

@@ -3,8 +3,6 @@ using Mesnac.Controls.Base;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser
 {
@@ -19,7 +17,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser
             ICSharpCode.Core.LoggingService<InitFormAction>.Debug("糊化机报表-窗体初始化...");
 
             #region 获取界面控件
-
             DbMCControl clientGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Report_GelDoser").FirstOrDefault();         //获取本机台计划网格控件
 
             if (clientGridControl == null)

Main/MCEdit/Data/MCProject/SCWSProject2.mprj

@@ -37,12 +37,9 @@
       <Node Name="FormMix" Text="混合配方管理" ToolTipText="FormMix" Tag="FormMix" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormProductLine" Text="榄菊产线管理" ToolTipText="FormProductLine" Tag="FormProductLine" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormDeviceMonitor" Text="榄菊设备监控" ToolTipText="FormDeviceMonitor" Tag="FormDeviceMonitor" ImageIndex="3" SelectedImageIndex="3" />
-      <Node Name="FormdeviceDetail" Text="设备细节" ToolTipText="FormdeviceDetail" Tag="FormdeviceDetail" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormDeviceDetail2" Text="设备细节2" ToolTipText="FormDeviceDetail2" Tag="FormDeviceDetail2" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormPlan" Text="榄菊计划管理" ToolTipText="FormPlan" Tag="FormPlan" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormSheBei" Text="榄菊设备配方" ToolTipText="FormSheBei" Tag="FormSheBei" ImageIndex="3" SelectedImageIndex="3" />
-
-
       <Node Name="Report_DryMixer" Text="干混机报表" ToolTipText="Report_DryMixer" Tag="Report_DryMixer" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="湿混机报表" Text="湿混机报表" ToolTipText="湿混机报表" Tag="湿混机报表" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="糊化机报表" Text="糊化机报表" ToolTipText="糊化机报表" Tag="糊化机报表" ImageIndex="3" SelectedImageIndex="3" />

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

@@ -3920,7 +3920,7 @@
     <Property name="BackColor">Control</Property>
     <Property name="Size">1940, 1076</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
-    <Property name="Text">设备细节2</Property>
+    <Property name="Text">监控主界面</Property>
     <Property name="WindowState">Normal</Property>
     <Property name="BackgroundImage" />
     <Property name="BackgroundImageLayout">Tile</Property>