From d96cc23eecd3dcd68612cf2a70aacfd5c667b339 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 14 八月 2025 18:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 1564021..62c774f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -371,22 +371,25 @@
return;
}
- if (decimal.TryParse(row["bld007"].ToString(), out decimal msl) &&
- decimal.TryParse(row["kbsl"].ToString(), out decimal kbsl))
+ if (txt_bl017.Text.Trim()=="鐢熶骇琛ユ枡")
{
- if (msl > kbsl)
+ if (decimal.TryParse(row["bld007"].ToString(), out decimal msl) &&
+ decimal.TryParse(row["kbsl"].ToString(), out decimal kbsl))
{
+ if (msl > kbsl)
+ {
+ MsgHelper.ShowError("" +
+ "鐢宠鏁伴噺涓嶈兘澶т簬鍙ˉ鏁伴噺锛�");
+ return;
+ }
+ }
+ else
+ {
+ // 瑙ｆ瀽澶辫触鐨勫鐞�
MsgHelper.ShowError("" +
- "鐢宠鏁伴噺涓嶈兘澶т簬鍙ˉ鏁伴噺锛�");
+ "杈撳叆鐨勪笉鏄湁鏁堟暟瀛楋紒");
return;
}
- }
- else
- {
- // 瑙ｆ瀽澶辫触鐨勫鐞�
- MsgHelper.ShowError("" +
- "杈撳叆鐨勪笉鏄湁鏁堟暟瀛楋紒");
- return;
}
_obj.list.Add(new
--
Gitblit v1.9.3