From dd0af4a5532c251fd655024ba475f72eaf9c93a0 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 18 八月 2025 16:20:10 +0800
Subject: [PATCH] 汇总
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index d6fee45..ab740fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -64,7 +64,11 @@
btnIpt.Click += BtnIpt_Click;
string rptName = "";
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())
{
}
@@ -502,6 +507,10 @@
{
_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