From 502ca66d25de558fb7d058c4bef8f2de2eeaec3d Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Fri, 17 Nov 2023 09:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E7=AE=80=E5=8C=96=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainDetailControlAction.cs                |  4 --
 .../Mesnac.Action.ChemicalWeighing.csproj     |  1 -
 .../Pl/PlcConnect.cs                          | 37 -------------------
 .../Report/DryMixer/SelectRowAction.cs        | 12 +++---
 4 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index ef04581..95d571e 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -61,8 +61,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
         byte[] reachState;
         byte[] mixState;
 
-
-
         #endregion
 
         #region 控件变量
@@ -1489,8 +1487,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
 
         #endregion
 
-
-
         #region 图像控件交互
 
         /// <summary>
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 9d00382..050fffa 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -565,7 +565,6 @@
     <Compile Include="MaterialManage\ModifyMaterialAction.cs" />
     <Compile Include="MinAn\MinAnPlc.cs" />
     <Compile Include="OliveEQSetting\InItDbAction.cs" />
-    <Compile Include="Pl\PlcConnect.cs" />
     <Compile Include="Product\ProductHelper.cs" />
     <Compile Include="ProjectDebug\OpenProjectDebug.cs" />
     <Compile Include="ProjectDebug\XC_DebugAction.cs" />
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs
deleted file mode 100644
index ba076a2..0000000
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//using HslCommunication.Profinet.Siemens;
-
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using System.Threading.Tasks;
-
-//namespace Mesnac.Action.ChemicalWeighing.Pl
-//{
-//    public class PlcConnect
-//    {
-
-       
-//        private static readonly Lazy<SiemensS7Net> lazy = new Lazy<SiemensS7Net>(() => new PlcConnect().SiemensS7NetConnection());
-//        public static SiemensS7Net Instance => lazy.Value;
-
-//        private PlcConnect()
-//        {
-
-//        }
-
-
-        
-
-
-//        private SiemensS7Net SiemensS7NetConnection()
-//        {
-//            SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
-//            SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
-//            s7.IpAddress = PlcAddressUtil.IpAddress;
-//            s7.Port = PlcAddressUtil.Port;
-//            s7.ConnectServer();
-//            return s7;
-//        }
-//    }
-//}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs
index c8051b6..837d8d1 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs
@@ -37,7 +37,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer
 
             this._clientGridControl = GetAllControls().Where(x => x.Name.Contains("MultiColHeaderDgv1")).FirstOrDefault();
 
-          
+
 
             Mesnac.Controls.Default.MultiColHeaderDgv clientGrid = (this._clientGridControl as Mesnac.Controls.Default.MultiColHeaderDgv);
 
@@ -90,10 +90,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer
 
                 //获取明细数据
                 StringBuilder sqlStr = new StringBuilder(@"select t1.batch as 批次号,t2.MName as 物料,
-t1.actValue as 实际重量,t1.actToler as 实际公差
- from Report_DryDos_Detail t1
- left join lj_stock_material t2 on t1.matCode = t2.Code
- where t2.MTypeId=1 and t1.reportId = @reportId");
+                        t1.actValue as 实际重量,t1.actToler as 实际公差
+                        from Report_DryDos_Detail t1
+                        left join lj_stock_material t2 on t1.matCode = t2.Code
+                        where t2.MTypeId=1 and t1.reportId = @reportId");
                 dbHelper.CommandText = sqlStr.ToString();
                 dbHelper.CommandType = System.Data.CommandType.Text;
                 dbHelper.AddParameter("@reportId", lR_planID);
@@ -108,7 +108,7 @@ t1.actValue as 实际重量,t1.actToler as 实际公差
 
                 dbHelper.CommandText = sql.ToString();
                 dbHelper.CommandType = System.Data.CommandType.Text;
-                
+
                 DataTable tableB = dbHelper.ToDataTable();
 
                 clientGrid2.DataSource = tableB;