From acf9d7b001514b3586166cbd0609e9d836ada792 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 23 七月 2025 16:24:49 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/XtraForm1.cs |  130 +++++++++++--------------------------------
 1 files changed, 33 insertions(+), 97 deletions(-)

diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
index ed2e775..bc9910d 100644
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.cs
@@ -15,85 +15,6 @@
             InitializeComponent();
 
         }
-        /// <summary>
-        /// 鏄惁绗竴娆℃姇鍏�,0涓虹涓�娆℃姇鍏ワ紝1涓虹淮淇繃鏉ヨ鎶ュ簾鐨�2涓哄凡缁忔姤搴熻繃浜嗙殑锛�3杩斿伐杩囨潵閲嶆姇鐨�4娓呭熬宸ュ崟鐨勬姤搴�
-        /// </summary>
-        private string flagFirst = "0";  //鏄惁绗竴娆℃姇鍏�
-
-
-        private void simpleButton1_Click_1(object sender, EventArgs e)
-        {
-            AddDianJian();
-        }
-
-        //娣诲姞鐢垫鏁版嵁
-        private string AddDianJian()
-        {
-            string TM = "";
-            string JD = "";
-            string JY = "";
-            string JN = "";
-            string XL = "";
-            string GV = "";
-            string JDV = "";
-            string JYV = "";
-            string JNV = "";
-            string XLV = "";
-            string GVV = "";
-            //if (imaQAB009.EditValue.ToString() != VSLoginInfo.SystemParam["DianJianNo"].ToString())
-            //{
-            //    return "";
-            //}
-            //string sql = string.Format(@" select MIG006 from BASMIG(nolock) where MIG001='DianJianQuShu' and MIG003='{0}' and MIG005='Y'", txtDAA042.EditValue.ToString());
-            //DataTable dt = manager.GetDataTable(sql, "tmpBASMIG");
-            //if (dt == null || dt.Rows.Count <= 0)
-            //{
-            //    return "";
-            //}
-            try
-            {
-                //FileStream fs = new FileStream(dt.Rows[0][0].ToString(), FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                //int fsLen = (int)fs.Length;
-                //byte[] heByte = new byte[fsLen];
-                //fs.Read(heByte, 0, heByte.Length);
-                //string myStr = System.Text.Encoding.Default.GetString(heByte);
-                //fs.Close();
-                string strPath = @"D:\uploadData.txt";
-                string myStr = File.ReadAllText(strPath, Encoding.Default);
-                if (myStr == "")
-                {
-                    return "NULL";
-                }
-                File.WriteAllText(strPath, "");
-                JArray dsTemp = JArray.Parse(myStr);
-
-                foreach (var ss in dsTemp)  //鏌ユ壘鏌愪釜瀛楁涓庡��
-                {
-                    TM = (((JObject)ss)["TiaoMa"] == null) ? "" : ((JObject)ss)["TiaoMa"].ToString();
-                    JD = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["state"].ToString();
-                    JY = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["state"].ToString();
-                    JN = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["state"].ToString();
-                    XL = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["state"].ToString();
-                    GV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["state"].ToString();
-                    JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ", ");
-                    JYV = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["value"].ToString().Replace(" ", ", ");
-                    JNV = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["value"].ToString().Replace(" ", ", ");
-                    XLV = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["value"].ToString().Replace(" ", ", ");
-                    GVV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["value"].ToString().Replace(" ", ", ");
-                    Gs.DevApp.ToolBox.LogHelper.Debug("TM", TM);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("JD", JD);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("JY", JY);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("XL", XL);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("XLV", XLV);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("GVV", GVV);
-                }
-                return "宸查噰闆�";
-            }
-            catch (Exception e)
-            {
-                return "鏂囦欢鎵撳紑澶辫触," + e.Message;
-            }
-        }
 
         private void simpleButton2_Click(object sender, EventArgs e)
         {
@@ -111,73 +32,89 @@
             try//姘存鍙栨暟锛屽悗闈㈣ˉ鍏�
             {
                 System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+                System.Text.StringBuilder sbFj = new System.Text.StringBuilder();
+                string hx = "\r\n";
                 string hostname = "192.168.60.51";
                 ModbusFactory modbusFactory = new ModbusFactory();
                 IModbusMaster master = modbusFactory.CreateMaster(new TcpClient(hostname, 502));
                 master.Transport.ReadTimeout = 10000;
                 master.Transport.Retries = 10000;
-                DataTable dt = new DataTable();
+
                 //鍙傛暟(鍒嗗埆涓轰粠绔欏湴鍧�,璧峰鍦板潃,闀垮害)
-                byte slaveAddress = byte.Parse(1.ToString());
+                byte slaveAddress = byte.Parse(txt_slaveAddress.SelectedText.Trim());
                 ushort numberOfPoints = ushort.Parse("1");
                 float fsw = 0;
-                DataTable dt1 = new DataTable();
+
+                //妯″紡1鍑烘按閲�
                 ushort[] csl1 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(32.ToString()), numberOfPoints);
                 strCsl1 = csl1[0].ToString();
-
+                sbFj.Append("妯″紡1鍑烘按閲�:" + strCsl1 + hx);
+                //妯″紡1姘存俯
                 ushort[] sw1 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(31.ToString()), numberOfPoints);
                 strSw1 = (float.Parse(sw1[0].ToString()) / 10).ToString();
-
+                sbFj.Append("妯″紡1姘存俯:" + strSw1 + hx);
+                //妯″紡2鍑烘按閲�
                 ushort[] csl2 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(34.ToString()), numberOfPoints);
                 strCsl2 = csl2[0].ToString();
-
+                sbFj.Append("妯″紡2鍑烘按閲�:" + strCsl2 + hx);
+                //妯″紡2姘存俯
                 ushort[] sw2 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(33.ToString()), numberOfPoints);
                 strSw2 = (float.Parse(sw2[0].ToString()) / 10).ToString();
-
+                sbFj.Append("妯″紡2姘存俯:" + strSw2 + hx);
+                //妯″紡3鍑烘按閲�
                 ushort[] csl3 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(36.ToString()), numberOfPoints);
                 strCsl3 = csl3[0].ToString();
-
+                sbFj.Append("妯″紡3鍑烘按閲�:" + strCsl3 + hx);
+                //妯″紡3姘存俯
                 ushort[] sw3 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(35.ToString()), numberOfPoints);
                 strSw3 = (float.Parse(sw3[0].ToString()) / 10).ToString();
-
+                sbFj.Append("妯″紡3姘存俯:" + strSw3 + hx);
+                //妯″紡4鍑烘按閲�
                 ushort[] csl4 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(38.ToString()), numberOfPoints);
                 strCsl4 = csl4[0].ToString();
-
+                sbFj.Append("妯″紡4鍑烘按閲�:" + strCsl4 + hx);
+                //妯″紡4姘存俯
                 ushort[] sw4 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(37.ToString()), numberOfPoints);
                 strSw4 = (float.Parse(sw4[0].ToString()) / 10).ToString();
-
+                sbFj.Append("妯″紡4姘存俯:" + strSw4 + hx);
+                //妯″紡5鍑烘按閲�
                 ushort[] csl5 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(40.ToString()), numberOfPoints);
                 strCsl5 = csl5[0].ToString();
-
+                sbFj.Append("妯″紡5鍑烘按閲�:" + strCsl5 + hx);
+                //妯″紡5姘存俯
                 ushort[] sw5 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(39.ToString()), numberOfPoints);
                 strSw5 = (float.Parse(sw5[0].ToString()) / 10).ToString();
-
+                sbFj.Append("妯″紡5姘存俯:" + strSw5 + hx);
+                //缁撴灉
                 bool[] sjjg = master.ReadCoils(slaveAddress, ushort.Parse(77.ToString()), numberOfPoints);
                 SJJG = sjjg[0].ToString();
+                sbFj.Append("缁撴灉:" + SJJG + hx);
                 ///////////////////
-                ///
 
-                // 3. 璇诲彇浠庣珯璁惧鐨勫瘎瀛樺櫒
+                // 3. 璇诲彇浠庣珯璁惧鐨勫瘎瀛樺櫒short锛堟棤绗﹀彿鐭暣鍨嬶級鏄竴绉嶆暟鎹被鍨嬶紝鐢ㄤ簬琛ㄧず16浣嶆棤绗﹀彿鏁存暟锛屽叾鍙栧�艰寖鍥翠粠0鍒�65,535
                 ushort startAddress = 0;   // 瀵勫瓨鍣ㄨ捣濮嬪湴鍧�
-                ushort numRegisters = 100;  // 璇诲彇 10 涓瘎瀛樺櫒
+                ushort numRegisters = ushort.Parse(txtGs.Text.Trim());  // 璇诲彇 10 涓瘎瀛樺櫒
                 try
                 {
                     // 璇诲彇淇濇寔瀵勫瓨鍣紙浠庣珯鍦板潃涓� 1锛�
+                    // 鍙傛暟(鍒嗗埆涓轰粠绔欏湴鍧�,璧峰鍦板潃,闀垮害)
                     ushort[] registers = master.ReadHoldingRegisters(1, startAddress, numRegisters);
                     // 杈撳嚭缁撴灉
                     Console.WriteLine("璇诲彇鍒扮殑瀵勫瓨鍣ㄥ�硷細");
+                    stringBuilder.Append("鎬诲瓧鑺備覆锛�");
                     foreach (var register in registers)
                     {
                         Console.WriteLine(register);
                         stringBuilder.Append(register);
                     }
+                    stringBuilder.Append(hx + "瑙f瀽缁撴灉锛�" + hx);
+                    stringBuilder.Append(sbFj);
                     richTextBox1.Text = stringBuilder.ToString();
                 }
                 catch (Exception ex)
                 {
                     Console.WriteLine($"璇诲彇閿欒: {ex.Message}");
                 }
-
             }
             catch (Exception ex)
             {
@@ -185,7 +122,6 @@
                 //txtGWM.EditValue = "";
                 return;
             }
-
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3