From 98267f9dfb90aa98eb55e7abeabc52d3f8a5b694 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 27 八月 2025 15:25:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
index f922fd6..3d996f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
@@ -306,6 +306,7 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
GetDepartmentData();
GetLineData();
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_OrgId);
getPageList(this.pageBar1.CurrentPage);
}
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
@@ -323,6 +324,7 @@
getModel(rowGuid);
GetDepartmentData();
GetLineData();
+ txt_OrgId.IsReadly = true;
getPageList(this.pageBar1.CurrentPage);
}
@@ -382,7 +384,8 @@
departmentId = departmentId,
departmentName = departmentName,
lineNo = lineNo,
- lineName = lineName
+ lineName = lineName,
+ orgId = txt_OrgId.GetId().Trim(),//宸ュ崟绫诲瀷
};
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
@@ -409,7 +412,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.OrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3