From 10682f34abfcfcd7a3bfa8ab359bb1602a1e3503 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 25 七月 2025 08:10:40 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/Program.cs | 4 ++--
DevApp/Gs.DevApp/XtraForm1.cs | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 4dd0414..2ae901a 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -40,8 +40,8 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new Gs.DevApp.XtraForm1());
- //return;
+ Application.Run(new Gs.DevApp.XtraForm1());
+ return;
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
Cef.Initialize(settings);
diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
index 7e9f177..f318ce3 100644
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.cs
@@ -171,7 +171,9 @@
private void simpleButton1_Click(object sender, EventArgs e)
{
- DataTable dataTable1 = this.GetDataTable($"select MIG004,MIG005 from BASMIG(nolock) where MIG001='ShuiJianZhanWei01' and MIG003='{((BaseEdit)this.txtGWM).EditValue.ToString()}'", "tmpBASMIG2");
+ System.Text.StringBuilder sbSql1 = new StringBuilder();
+ sbSql1.Append($"select MIG004,MIG005 from BASMIG(nolock) where MIG001='ShuiJianZhanWei01' and MIG003='{((BaseEdit)this.txtGWM).EditValue.ToString()}'");
+ DataTable dataTable1 = this.GetDataTable(sbSql1.ToString(), "tmpBASMIG2");
if (dataTable1 == null || dataTable1.Rows.Count <= 0)
{
MessageBox.Show("璇ユ按妫�绔欎綅鐮佷笉瀛樺湪锛岃纭锛�");
@@ -182,7 +184,9 @@
ModbusFactory modbusFactory = new ModbusFactory();
byte num1 = byte.Parse("1");
ushort num2 = ushort.Parse("1");
- DataTable dataTable2 = GetDataTable(string.Format($"select case when MIG006='D' then MIG003+{dataTable1.Rows[0][0]} else MIG003+{dataTable1.Rows[0][1]} end MIG003,MIG004 from BASMIG(nolock) where MIG001 = 'ShuiJianAddress01' order by MIG005"), "tmpBASMIG3");
+ System.Text.StringBuilder sbSql2 = new StringBuilder();
+ sbSql2.Append(string.Format($"select case when MIG006='D' then MIG003+{dataTable1.Rows[0][0]} else MIG003+{dataTable1.Rows[0][1]} end MIG003,MIG004 from BASMIG(nolock) where MIG001 = 'ShuiJianAddress01' order by MIG005"));
+ DataTable dataTable2 = GetDataTable(sbSql2.ToString(), "tmpBASMIG3");
if (dataTable2 == null || dataTable2.Rows.Count <= 0)
{
MessageBox.Show("姘存鍦板潃涓嶅瓨鍦紝璇风‘璁わ紒");
@@ -250,7 +254,6 @@
{
throw new Exception(ex.Message);
}
-
return ds.Tables[0];
}
}
--
Gitblit v1.9.3