From 8827ee945f313bdafbe9fdab481c0a0660c551bd Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期二, 16 十二月 2025 09:53:05 +0800
Subject: [PATCH] 1.巡检新增提交审核标识判断逻辑
---
StandardPda/MESApplication/Controllers/QC/SJController.cs | 85 +++++++++++++++++++-----------------------
1 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/QC/SJController.cs b/StandardPda/MESApplication/Controllers/QC/SJController.cs
index a06c558..aeeb63b 100644
--- a/StandardPda/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SJController.cs
@@ -338,8 +338,8 @@
//------------------ SN鎵爜鏍￠獙 ------------------
var sql1 =
@"select SCAN_ITEM
- from ZMZ_TEST.MES_SJ_SCAN_ITEM_CK
- where mid='" + rkjDto.gid + "' and sn_no is null";
+ from ZMZ_TEST.MES_SJ_SCAN_ITEM_CK
+ where mid='" + rkjDto.gid + "' and sn_no is null";
var dataTable1 = SQLHelper.ExecuteQuery(sql1);
string msg = "";
@@ -373,11 +373,11 @@
//------------------ 涓嶅悎鏍煎浘鐗囨槸鍚︿笂浼犳牎楠� ------------------
var sql2 =
@"select A.id, A.PROJ_NAME, B.id as id2
- from QS_ITEM_IPI_ITEM A
- left join MES_QS_IMAGE B on 777 || A.ID = B.FID
- where A.PID = '" + rkjDto.gid + @"'
- and B.id is null
- and IS_PASS = 0";
+ from QS_ITEM_IPI_ITEM A
+ left join MES_QS_IMAGE B on 777 || A.ID = B.FID
+ where A.PID = '" + rkjDto.gid + @"'
+ and B.id is null
+ and IS_PASS = 0";
var dt2 = SQLHelper.ExecuteQuery(sql2);
if (dt2.Rows.Count > 0)
@@ -399,11 +399,11 @@
//------------------ 蹇呭～椤瑰浘鐗囨槸鍚︿笂浼犳牎楠� ------------------
var sql3 =
@"select A.id, A.PROJ_NAME, B.id as id2
- from QS_ITEM_IPI_ITEM A
- left join MES_QS_IMAGE B on 777 || A.ID = B.FID
- where A.PID = '" + rkjDto.gid + @"'
- and B.id is null
- and UP_FILE = 1";
+ from QS_ITEM_IPI_ITEM A
+ left join MES_QS_IMAGE B on 777 || A.ID = B.FID
+ where A.PID = '" + rkjDto.gid + @"'
+ and B.id is null
+ and UP_FILE = 1";
var dt3 = SQLHelper.ExecuteQuery(sql3);
if (dt3.Rows.Count > 0)
@@ -425,9 +425,9 @@
//------------------ 鏂板鏍￠獙锛氭鏌ユ槸鍚﹀瓨鍦ㄦ湭瀹屾垚锛圛S_PASS is null锛� ------------------
var sqlPass =
@"select ID, PROJ_NAME
- from QS_ITEM_IPI_ITEM
- where PID = '" + rkjDto.gid + @"'
- and IS_PASS is null";
+ from QS_ITEM_IPI_ITEM
+ where PID = '" + rkjDto.gid + @"'
+ and IS_PASS is null";
var dtPass = SQLHelper.ExecuteQuery(sqlPass);
if (dtPass.Rows.Count > 0)
@@ -451,38 +451,29 @@
var tbBillList = new SJService().SJQaSubmit(rkjDto);
resultInfos.tbBillList = tbBillList;
//================= 鍒ゆ柇妫�楠屽悎鏍肩敓鎴愬贰妫�鍗� =========
- var sqlpass6 = $@"update QS_ITEM_IPI_REQ set FSUBMIT1 = 1 where ID = '{rkjDto.gid}' ";
+ var sqlpass6 = $@"update QS_ITEM_IPI_REQ set FSUBMIT = 1 where ID = '{rkjDto.gid}' ";
var dtPass7 = SQLHelper.ExecuteQuery(sqlpass6);
-
-
-
var sqlPass1 = $@"
- SELECT
- IS_PASS
- FROM QS_ITEM_IPI_REQ
- WHERE ID = '{rkjDto.gid}'
- ";
+ SELECT
+ IS_PASS
+ FROM QS_ITEM_IPI_REQ
+ WHERE ID = '{rkjDto.gid}'
+ ";
var dtPass1 = SQLHelper.ExecuteQuery(sqlPass1);
var sqlPass3 = $@"select C.ID from QS_ITEM_IPI_REQ A
-LEFT JOIN V_MES_SJ B on b.BILL_NO = A.BILL_NO
-LEFT JOIN WOMDAA C on C.DAA001 = B.DAA001
-WHERE A.ID = '{rkjDto.gid}'
-";
-
+ LEFT JOIN V_MES_SJ B on b.BILL_NO = A.BILL_NO
+ LEFT JOIN WOMDAA C on C.DAA001 = B.DAA001
+ WHERE A.ID = '{rkjDto.gid}'
+ ";
var dtPass3 = SQLHelper.ExecuteQuery(sqlPass3);
var value4 = dtPass3.Rows[0][0];
int sqlPass2 = Convert.ToInt32(value4);
-
bool isPass = false;
-
-
-
-
if (dtPass1 != null && dtPass1.Rows.Count > 0)
@@ -492,13 +483,15 @@
// 鍒ゆ柇涓哄悎鏍硷紙IS_PASS = 1锛�
if (value == "1")
{
-
+ var sqlpass4 = $@"update QS_ITEM_IPI_REQ set FSUBMIT1 = 1 where ID = '{rkjDto.gid}' ";
+
+ var dtPass5 = SQLHelper.ExecuteQuery(sqlpass4);
isPass = true;
}
else
{
- var sqlpass4 = $@"update QS_ITEM_IPI_REQ set FSUBMIT = 0 where ID = '{rkjDto.gid}' ";
+ var sqlpass4 = $@"update QS_ITEM_IPI_REQ set FSUBMIT1 = 0 where ID = '{rkjDto.gid}' ";
var dtPass5 = SQLHelper.ExecuteQuery(sqlpass4);
}
@@ -518,16 +511,15 @@
// ===== 杈撳叆鍙傛暟 =====
var parameters = new List<SugarParameter>
- {
- new SugarParameter("P_ID", sqlPass2, DbType.Int64, ParameterDirection.Input),
- new SugarParameter("P_USER", rkjDto.userNo, DbType.String, ParameterDirection.Input),
- new SugarParameter("P_ISH", 0, DbType.Int64, ParameterDirection.Input),
+ {
+ new SugarParameter("P_ID", sqlPass2, DbType.Int64, ParameterDirection.Input),
+ new SugarParameter("P_USER", rkjDto.userNo, DbType.String, ParameterDirection.Input),
+ new SugarParameter("P_ISH", 0, DbType.Int64, ParameterDirection.Input),
- // 杈撳嚭鍙傛暟蹇呴』甯︿笂
- outFlag,
- outText
- };
-
+ // 杈撳嚭鍙傛暟蹇呴』甯︿笂
+ outFlag,
+ outText
+ };
// ===== 鎵ц瀛樺偍杩囩▼ =====
db.Ado.ExecuteCommand(
"BEGIN PRC_XJ_GENERATE(:P_ID, :P_USER, :P_ISH, :P_FLAG, :P_TEXT); END;",
@@ -558,7 +550,8 @@
-
+
+
--
Gitblit v1.9.3