From 4e3866d4a9f8b55dd2a6dceaf64ec0b50458e9bd Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 16 九月 2025 23:32:59 +0800
Subject: [PATCH] 111
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index ec4b11c..c76d2ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -210,8 +210,6 @@
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
- //澧炲姞鏃讹紝榛樿缁勭粐
- string deftOrg = UtilityHelper.GetFirstOrg(txt_fSubsidiary);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -236,12 +234,12 @@
txt_itemId.Focus();
return;
}
- //if (string.IsNullOrEmpty(_suppNo))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
- // txt_suppId.Focus();
- // return;
- //}
+ if (string.IsNullOrEmpty(_suppNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
+ txt_suppId.Focus();
+ return;
+ }
var _obj = new MesQaMj
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -260,14 +258,6 @@
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
-
- // 銆愭柊澧炲埛鏂伴�昏緫銆戜繚瀛樻垚鍔熷悗绔嬪嵆鍒锋柊褰撳墠妯″瀷鏁版嵁鍜屽垪琛�
- // 鍒锋柊褰撳墠鍗曟嵁璇︽儏
- getModel(lbGuid.Text.Trim());
- // 鍒锋柊鍒楄〃椤垫暟鎹�
- getPageList(this.pageBar1.CurrentPage);
-
-
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
@@ -284,8 +274,14 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- _sbSqlWhere += " and b.guid is not null";
+ gcMain1.DataSource = null;
+
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and b.guid is not null");
+ _sbSqlWhere.Append(" and org.fid in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.ITEM_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3