From 33583f8a9716e4313163fb9bbde58fea02012a28 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 08 九月 2025 14:28:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
index e7f4fa1..d5d3076 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
@@ -56,7 +56,10 @@
private void getPageList(int curPage)
{
gcMain.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and org.fid in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
var json = JsonConvert.SerializeObject(pgq);
try
@@ -72,7 +75,8 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
- gvMain.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMain);
+ gvMain.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMain);
}
else
UtilityHelper.SetDefaultTable(gcMain, gvMain);
--
Gitblit v1.9.3