From b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:19:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/XtraForm1.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
index b7fc7a0..f318ce3 100644
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.cs
@@ -23,7 +23,6 @@
public XtraForm1()
{
InitializeComponent();
-
}
private void simpleButton2_Click(object sender, EventArgs e)
@@ -172,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("璇ユ按妫�绔欎綅鐮佷笉瀛樺湪锛岃纭锛�");
@@ -183,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("姘存鍦板潃涓嶅瓨鍦紝璇风‘璁わ紒");
@@ -251,7 +254,6 @@
{
throw new Exception(ex.Message);
}
-
return ds.Tables[0];
}
}
--
Gitblit v1.9.3