From 1f99c554ffc67f599fbce5981a3da584945b3b16 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 18 八月 2025 14:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index bfab458..ab740fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -507,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