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

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/StockMaterrialDBHelp.cs

@@ -77,9 +77,22 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
 
         public static int GetCodeById(int id)
         {
-            string sql = $"select Code from  lj_stock_material where Id={id}";
-            var dataTable = DBHelp.GetTable(sql);
-            return Convert.ToInt16(dataTable.Rows[0][0]);
+
+            if (id > 0)
+            {
+                string sql = $"select Code from  lj_stock_material where Id={id}";
+                var dataTable = DBHelp.GetTable(sql);
+                if (dataTable.Rows.Count == 1)
+                {
+                    return Convert.ToInt16(dataTable.Rows[0][0]);
+                }
+
+                return id;
+
+            }
+
+            return id;
+
         }
         
      

DataBlockHelper/DBHelpers/DB2105WriteHelper.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace DataBlockHelper.DBHelpers
 {
@@ -182,5 +183,212 @@ namespace DataBlockHelper.DBHelpers
             siemensS7Net.Write($"{DbName}:{start+4}.0", setValue.Toterance);
             
         }
+
+
+        /// <summary>
+        /// 点击下粉料按钮  如果返回true  就是成功 如果返回失败 就是准备信号么有准备好
+        /// </summary>
+        /// <returns></returns>
+        public static bool WriteG1Pd()
+        {
+            return WriteG(94,3);
+        }
+        
+        public static bool WriteG1Cw()
+        {
+            return WriteG(94,4);
+        }
+        
+        public static bool WriteG1Hw()
+        {
+            return WriteG(94,5);
+        }
+
+        
+        public static bool WriteG2Pd()
+        {
+            return WriteG(96,3);
+        }
+        
+        public static bool WriteG2Cw()
+        {
+            return WriteG(96,4);
+        }
+        
+        public static bool WriteG2Hw()
+        {
+            return WriteG(96,5);
+        }
+        
+        
+        
+        public static bool WriteG3Pd()
+        {
+            return WriteG(98,3);
+        }
+        
+        public static bool WriteG3Cw()
+        {
+            return WriteG(98,4);
+        }
+        
+        public static bool WriteG3Hw()
+        {
+            return WriteG(98,5);
+        }
+        
+        
+        public static bool WriteG4Pd()
+        {
+            return WriteG(100,3);
+        }
+        
+        public static bool WriteG4Cw()
+        {
+            return WriteG(100,4);
+        }
+        
+        public static bool WriteG4Hw()
+        {
+            return WriteG(100,5);
+        }
+        
+        
+        public static bool WriteG5Pd()
+        {
+            return WriteG(102,3);
+        }
+        
+        public static bool WriteG5Cw()
+        {
+            return WriteG(102,4);
+        }
+        
+        public static bool WriteG5Hw()
+        {
+            return WriteG(102,5);
+        }
+        
+        
+        public static bool WriteG6Pd()
+        {
+            return WriteG(104,3);
+        }
+        
+        public static bool WriteG6Cw()
+        {
+            return WriteG(104,4);
+        }
+        
+        public static bool WriteG6Hw()
+        {
+            return WriteG(104,5);
+        }
+        
+        
+        public static bool WriteG7Pd()
+        {
+            return WriteG(106,3);
+        }
+        
+        public static bool WriteG7Cw()
+        {
+            return WriteG(106,4);
+        }
+        
+        public static bool WriteG7Hw()
+        {
+            return WriteG(106,5);
+        }
+        
+        
+        public static bool WriteG8Pd()
+        {
+            return WriteG(108,3);
+        }
+        
+        public static bool WriteG8Cw()
+        {
+            return WriteG(108,4);
+        }
+        
+        public static bool WriteG8Hw()
+        {
+            return WriteG(108,5);
+        }
+        
+        
+        /// <summary>
+        /// 点击下粉料按钮 湿混机  如果返回true  就是成功 如果返回失败 就是准备信号么有准备好
+        /// </summary>
+        /// <returns></returns>
+
+        public static bool WriteM1()
+        {
+            return WriteM(110);
+        }
+        
+        public static bool WriteM2()
+        {
+            return WriteM(112);
+        }
+        
+        public static bool WriteM3()
+        {
+            return WriteM(114);
+        }
+        public static bool WriteM4()
+        {
+            return WriteM(116);
+        }
+        public static bool WriteM5()
+        {
+            return WriteM(118);
+        }
+        public static bool WriteM6()
+        {
+            return WriteM(120);
+        }
+        public static bool WriteM7()
+        {
+            return WriteM(122);
+        }
+        
+        public static bool WriteM8()
+        {
+            return WriteM(124);
+        }
+
+        
+
+        private static bool WriteG(int start,int dian)
+        {
+            var siemensS7Net = PlcConnect.Instance;
+            var operateResult = siemensS7Net.ReadBool($"{DbName}.{start}.{dian}");
+            if (!operateResult.Content)
+            {
+                return false;
+            }
+
+            var operate= siemensS7Net.Write($"{DbName}.{start}.{dian-3}", true);
+            return operate.IsSuccess;
+        }
+        
+        
+        private static bool WriteM(int start)
+        {
+            var siemensS7Net = PlcConnect.Instance;
+            var operateResult = siemensS7Net.ReadBool($"{DbName}.{start}.1");
+            if (!operateResult.Content)
+            {
+                return false;
+            }
+
+            var operate= siemensS7Net.Write($"{DbName}.{start}.0", true);
+            return operate.IsSuccess;
+        }
+        
+        
+        
     }
 }