From 7e2fe692d16412e0c20a433a81cb85a3cb39cb2b Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 30 八月 2025 17:07:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index f0d6a28..74e574b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -279,7 +279,6 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
ucLookHuoZhu1.Enabled = true;
-
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
@@ -301,6 +300,7 @@
string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
+ string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
if (string.IsNullOrEmpty(inOrgId))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -317,16 +317,16 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (txt_qt019.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_qt019.Focus();
- return;
- }
if (string.IsNullOrEmpty(inLyOrg))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
txt_qt024.Focus();
+ return;
+ }
+ if (txt_qtlx.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍏ュ簱绫诲瀷锛�");
+ txt_qtlx.Focus();
return;
}
if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
@@ -334,12 +334,6 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
return;
}
- //if (txt_qt020.SelectedIndex <= 0)
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
- // txt_qt020.Focus();
- // return;
- //}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -353,6 +347,7 @@
inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
inSource = txt_qt035.EditValue,//宸ュ崟鍙�
+ qtlx=qtlx,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -395,7 +390,6 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
if (_rtn.rtnCode > 0)
{
ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -425,7 +419,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.qt023 in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -675,10 +673,18 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
+ else
+ {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
+
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -775,7 +781,5 @@
};
frm.ShowDialog();
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3