From e72f34545b96332b8bff76294b7d397630139d9c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 13 九月 2025 16:06:22 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
index dcf51e9..08607ab 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
@@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data;
+using System.Linq;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -211,8 +212,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- // _sbSqlWhere += " and isnull(fsubmit,0)=0";
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and daa.erp_sczz in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -386,10 +390,15 @@
{
if (e.Button.Index == 0)
{
+ var userGuid =
+ string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid)
+ ? Guid.NewGuid().ToString()
+ : LoginInfoModel.CurrentUser.LoginUserGuid;
+
var rowhandle = gridView1.FocusedRowHandle;
var dr = gridView1.GetDataRow(rowhandle);
- var userGuid = dr["guid"].ToString()+"&mth="+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
- Frm_ShouJianDetect01H5 frm = new Frm_ShouJianDetect01H5(userGuid);
+ var qcGuid = dr["guid"].ToString()+"&mth="+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")+"&userGuid="+ userGuid;
+ Frm_ShouJianDetect01H5 frm = new Frm_ShouJianDetect01H5(qcGuid);
frm.ShowDialog();
}
}
--
Gitblit v1.9.3