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/RkQC/RkDetect01.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index b579ad7..d8c36e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -63,8 +63,12 @@
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
string rptName = "";
- if (strType == QcSeason.鐢熶骇閫�鏂欏叆搴撴.ToString())
- rptName = "rpt_SCTL";
+ if (strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
+ {
+ rptName = "rpt_Strk";
+ layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ }
else
if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
{
@@ -439,7 +443,8 @@
toolBarMenu1.isSetBtn = false;
string rkckid = txt_rkCkId.GetId();
if (strType == QcSeason.瓒呮湡妫�.ToString()
- || strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
+ || strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString()
+ || strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
{
}
@@ -497,11 +502,17 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ReceiveOrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
{
_sbSqlWhere.Append(" and isnull(qtrk.qt028,0)=1 and isnull(qtrk.qt032,0)=1 and isnull(qtrk.qt015,0)=1 ");
}
+ if (strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
+ {
+ _sbSqlWhere.Append(" and isnull(st.isCheck,0)=1 and isnull(st.qt032,0)=1");
+ }
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3