From 5afff49d3471e7c966f5e7d5ed30c28891f71c5d Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 01 九月 2025 17:48:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 4594b5b..880d0a9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -91,6 +91,16 @@
return;
}
var frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
+
+ if (txt_bl017.Text.Trim() == "鐢熶骇琛ユ枡")
+ {
+ frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId(), txt_bl017.Text.Trim());
+ }
+ else
+ {
+ frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
+
+ }
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -106,6 +116,7 @@
_row["bld002"] = dym.itemNo;//鐗╂枡缂栧彿
_row["bld003"] = dym.itemName;//鐗╂枡鍚嶇О
_row["bld004"] = dym.itemModel;//瑙勬牸鍨嬪彿
+ _row["kbsl"] = dym.kbsl;
_row["dwName"] = dym.dwName;
_row["dabGuid"] = dym.dabGuid;
_row["bld013"] = idx.ToString();//椤规
@@ -309,6 +320,8 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_orgId);
}
/// <summary>
@@ -363,11 +376,34 @@
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
string _msl = row["bld007"].ToString();
+ string _kbsl = row["kbsl"].ToString();
if (string.IsNullOrEmpty(_msl))
{
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+
+ if (txt_bl017.Text.Trim()=="鐢熶骇琛ユ枡")
+ {
+ 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;
+ }
+ }
+
_obj.list.Add(new
{
Guid = _guid,
--
Gitblit v1.9.3