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_MesAttanCon.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
index 9766c05..d196bbb 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
@@ -26,6 +26,7 @@
List<FilterEntity> _filterList = new List<FilterEntity>();
string date;
string lineNo;
+ string orgId;
// 鐢ㄤ簬璺熻釜鍘熷鍊肩殑瀛楀吀
private Dictionary<string, Dictionary<string, object>> _originalValues = new Dictionary<string, Dictionary<string, object>>();
@@ -65,7 +66,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- var frm = new KQCX(lineNo, date);
+ var frm = new KQCX(lineNo, date, orgId);
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -73,6 +74,7 @@
lst = ee.StringList;
lineNo = string.IsNullOrEmpty(lst[0]) ? "0" : lst[0];
date = string.IsNullOrEmpty(lst[1]) ? DateTime.Now.AddMonths(-1).ToString() : lst[1];
+ orgId = string.IsNullOrEmpty(lst[2]) ? "1" : lst[2];
getPageList();
};
frm.ShowDialog();
@@ -121,7 +123,8 @@
var _obj = new
{
date = date,
- lineNo = lineNo
+ lineNo = lineNo,
+ orgId = orgId
};
// gcMain1.DataSource = null;
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
@@ -249,7 +252,8 @@
var _obj = new
{
date = date,
- lineNo = lineNo
+ lineNo = lineNo,
+ orgId = orgId
};
try
{
--
Gitblit v1.9.3