From 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 18 九月 2025 16:16:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 5679160..6e78391 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -43,12 +43,13 @@
/// <param name="_fGx">宸ュ簭</param>
/// <param name="_fBc">鐝</param>
/// <param name="_strinOther">鐩墠涓虹數妫�璺緞</param>
- public Frm_Work01(string _fGx, string _fBc, string _strinOther)
+ /// <param name="chkWater">鏄惁姘存</param>
+ public Frm_Work01(string _fGx, string _fBc, string _strinOther, int chkWater = 0)
{
InitializeComponent();
try
{
- string _vanishingSeconds = ConfigurationManager.AppSettings["IsWater"];
+ string _vanishingSeconds = chkWater.ToString();
if (!string.IsNullOrEmpty(_vanishingSeconds))
isWater = _vanishingSeconds;
}
@@ -107,7 +108,15 @@
};
btnBad.Click += (s, e) =>
{
- string _collectGuid ="";
+ int idx = tabMx.SelectedTabPageIndex;
+ if (idx > 0)
+ {
+ Toast vm = new Toast(-1, "~宸插府浣犲垏鎹㈠埌銆愯壇鍝佹槑缁嗐��,璇烽噸鏂版搷浣渵");
+ vm.Show();
+ tabMx.SelectedTabPageIndex = 0;
+ return;
+ }
+ string _collectGuid = "";
string _collCode = "";
var dr = gvMx1.GetFocusedDataRow();
if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
@@ -125,7 +134,16 @@
return;
}
string _msg = "浣犲噯澶囧皢銆�" + _collCode + "銆戝彉鏇翠负涓嶈壇";
- UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
+ string _type = "";
+ if (txt_gx.Text.Trim() == fGxTouRu)
+ _type = "宸ュ簭G001:鎶曞叆涓嶈壇鎻忚堪";
+ if (txt_gx.Text.Trim() == fGxDianJian)
+ _type = "宸ュ簭G002:鐢垫涓嶈壇鎻忚堪";
+ if (txt_gx.Text.Trim() == fGxShouJian)
+ _type = "宸ュ簭G003:姘存涓嶈壇鎻忚堪";
+ if (txt_gx.Text.Trim() == fGxZhongJian)
+ _type = "宸ュ簭G004:缁堟涓嶈壇鎻忚堪";
+ UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='"+ _type + "' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
frm.UpdateParent += (ss, ee) =>
{
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
@@ -421,25 +439,25 @@
{
ziduan = "t007",
wenben = "鎺ュ湴缁撴灉",
- visibleIndex = -1,
+ visibleIndex = 1,
});
_lst.Add(new
{
ziduan = "t009",
wenben = "浜よ�愮粨鏋�",
- visibleIndex = -1,
+ visibleIndex = 1,
});
_lst.Add(new
{
ziduan = "t010",
wenben = "娉勬紡缁撴灉",
- visibleIndex = -1,
+ visibleIndex = 1,
});
_lst.Add(new
{
ziduan = "t011",
wenben = "鍔熺巼缁撴灉",
- visibleIndex = -1,
+ visibleIndex = 1,
});
}
if (txt_gx.Text.Trim() == fGxShouJian)
--
Gitblit v1.9.3