From 00a72fff219241eb5b0405a066cc859d07cf7735 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 10:23:44 +0800
Subject: [PATCH] 1111
---
service/QC/IpqcService.cs | 118 +++++++++++++++++++++++++---------------------------------
1 files changed, 51 insertions(+), 67 deletions(-)
diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs
index b93e5f6..df1c963 100644
--- a/service/QC/IpqcService.cs
+++ b/service/QC/IpqcService.cs
@@ -1,12 +1,13 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Text;
+锘縰sing MES.Service.Models;
using Microsoft.IdentityModel.Tokens;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
-using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.QC;
@@ -31,11 +32,11 @@
a.ItemName.Contains(queryObj.keyword) ||
a.Daa001.Contains(queryObj.keyword) ||
a.ReleaseNo.Contains(queryObj.keyword) ||
- a.DepartmentName.Contains(queryObj.keyword) ||
- a.XtName.Contains(queryObj.keyword)
+ a.DepartmentName.Contains(queryObj.keyword )||
+ a.XtName.Contains(queryObj.keyword)
)
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- a => a.Guid == parsedGuid.ToString())
+ a => a.Guid == parsedGuid.ToString() )
.Where(a => (a.FSubmit ?? 0) == 0)
.OrderByDescending(a => a.CreateDate)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -48,8 +49,7 @@
{
var parsedGuid = Guid.Empty;
- var sql = string.Format(
- @"SELECT [a].[guid] AS [Guid],
+ var sql = string.Format(@"SELECT [a].[guid] AS [Guid],
[a].[parent_guid] AS [ParentGuid],
[a].[release_no] AS [ReleaseNo],
[a].[check_qyt] AS [CheckQyt],
@@ -91,6 +91,9 @@
public (List<VIpqcXj> item, int TotalCount) getPageXj(XJPageResult queryObj)
{
+
+
+
var totalCount = 0;
var parsedGuid = Guid.Empty;
if (!queryObj.id.IsNullOrEmpty())
@@ -100,8 +103,7 @@
throw new ApplicationException("GUID杞崲閿欒");
}
- var sql =
- string.Format(@"EXEC prc_pda_ipqc_GetXjList '{0}'", parsedGuid);
+ var sql = string.Format(@"EXEC prc_pda_ipqc_GetXjList '{0}'", parsedGuid);
var pageList = Db.Ado.SqlQuery<VIpqcXj>(sql).ToList();
@@ -112,13 +114,11 @@
//鏇存柊涓嶅悎鏍兼弿杩�
public int updateIpqcRzxx(dynamic dto)
{
- if (dto == null)
- throw new ArgumentNullException(nameof(dto), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (dto == null) throw new ArgumentNullException(nameof(dto), "鍙傛暟瀵硅薄涓嶈兘涓� null");
if (string.IsNullOrEmpty(dto.pid?.ToString()))
throw new ArgumentException("椤圭洰鏄庣粏id瀛樺湪闂锛岃鑱旂郴绠＄悊鍛橈紒", nameof(dto.pid));
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@inRzxxValue", dto.inRzxxValue),
new("@pid", dto.pid)
};
@@ -139,13 +139,12 @@
throw new ArgumentException("鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖", nameof(query.userAccount));
if (string.IsNullOrEmpty(query.inOrderGuid1?.ToString()))
- throw new ArgumentException("妫�楠屽崟GUID涓嶈兘涓虹┖",
- nameof(query.inOrderGuid1));
+ throw new ArgumentException("妫�楠屽崟GUID涓嶈兘涓虹┖", nameof(query.inOrderGuid1));
- if (string.IsNullOrEmpty(query.DAA001?.ToString()))
- throw new ArgumentException("宸ュ崟鍙蜂笉鑳戒负绌�", nameof(query.inOrderGuid1));
+ if (string.IsNullOrEmpty(query.DAA001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍙蜂笉鑳戒负绌�", nameof(query.inOrderGuid1));
- var _strMsg = "";
+ var _strMsg = "";
var _status = -1;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
@@ -156,22 +155,15 @@
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@po_outMsg", SqlDbType.NVarChar, 150)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new("@pi_user", SqlDbType.NVarChar, 150)
- { Value = query.userAccount },
- new("@pi_OrderGuid1", SqlDbType.UniqueIdentifier)
- { Value = Guid.Parse(query.inOrderGuid1.ToString()) },
- new("@pi_DAA001", SqlDbType.NVarChar, 150)
- { Value = query.DAA001.ToString() },
- new("@pi_inP1", SqlDbType.NVarChar, 20)
- { Value = query.pi_inP1 ?? DBNull.Value },
- new("@pi_inP2", SqlDbType.NVarChar, 20)
- { Value = query.pi_inP2 ?? DBNull.Value }
+ new("@po_outMsg", SqlDbType.NVarChar, 150) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new("@pi_user", SqlDbType.NVarChar, 150) { Value = query.userAccount },
+ new("@pi_OrderGuid1", SqlDbType.UniqueIdentifier) { Value = Guid.Parse(query.inOrderGuid1.ToString()) },
+ new("@pi_DAA001", SqlDbType.NVarChar, 150) { Value = query.DAA001.ToString() },
+ new("@pi_inP1", SqlDbType.NVarChar, 20) { Value = query.pi_inP1 ?? DBNull.Value },
+ new("@pi_inP2", SqlDbType.NVarChar, 20) { Value = query.pi_inP2 ?? DBNull.Value }
};
cmd.Parameters.AddRange(parameters);
@@ -182,7 +174,7 @@
if (_status <= 0) throw new Exception(_strMsg);
- return new
+ return new
{
message = _strMsg,
status = _status
@@ -195,11 +187,9 @@
}
}
- public int UpdateTableConfig(string selectedWater, string selectedFlow,
- string tableData, string mxguid)
+ public int UpdateTableConfig(string selectedWater, string selectedFlow, string tableData, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@selectedWater", selectedWater),
new("@selectedFlow", selectedFlow),
new("@tableData", tableData),
@@ -217,8 +207,7 @@
public dynamic GetTableConfig(string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@mxguid", mxguid)
};
@@ -227,7 +216,7 @@
WHERE guid = @mxguid";
var result = Db.Ado.SqlQuery<dynamic>(sql, sqlParams).FirstOrDefault();
-
+
if (result == null)
throw new Exception("閰嶇疆淇℃伅鏌ヨ缁撴灉涓虹┖");
@@ -236,8 +225,7 @@
public List<dynamic> GetRzxxList(string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@mxguid", mxguid)
};
@@ -254,7 +242,7 @@
)";
var result = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
-
+
if (result == null || result.Count == 0)
throw new Exception("鏈壘鍒扮浉鍏宠璇佷俊鎭�");
@@ -263,8 +251,7 @@
public int UpdateScDate(string scDateValue, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@scDateValue", scDateValue),
new("@mxguid", mxguid)
};
@@ -278,8 +265,7 @@
public int UpdateRzxxNum(string ipqcrzxxNum, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@ipqcrzxxNum", ipqcrzxxNum),
new("@mxguid", mxguid)
};
@@ -293,8 +279,7 @@
public int UpdateCpscs(string ipqCpscs, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@ipqCpscs", ipqCpscs),
new("@mxguid", mxguid)
};
@@ -309,7 +294,8 @@
public dynamic GetIpqcXjDaa(dynamic unity)
{
- var sqlParams = new List<SugarParameter>();
+
+ var sqlParams = new List<SugarParameter> { };
sqlParams.Add(new("@xt", unity.xt));
var sql2 = new StringBuilder(@"
@@ -327,7 +313,10 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (XcslItem == null) throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ if (XcslItem == null)
+ {
+ throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ }
return XcslItem;
}
@@ -341,8 +330,7 @@
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
if (string.IsNullOrEmpty(query.inOrderGuid1?.ToString()))
- throw new ArgumentException("妫�楠屽崟涓昏〃GUID涓嶅厑璁镐负绌�",
- nameof(query.inOrderGuid1));
+ throw new ArgumentException("妫�楠屽崟涓昏〃GUID涓嶅厑璁镐负绌�", nameof(query.inOrderGuid1));
var _strMsg = "";
var _status = -1;
@@ -355,17 +343,13 @@
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
new("@pi_gw", SqlDbType.NVarChar, 100) { Value = query.gw },
- new("@pi_QaGuid1", SqlDbType.NVarChar, 100)
- { Value = query.inOrderGuid1 },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_QaGuid1", SqlDbType.NVarChar, 100) { Value = query.inOrderGuid1 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -376,12 +360,12 @@
if (_status <= 0) throw new Exception(_strMsg);
- return new
+ return new
{
message = _strMsg,
status = _status,
qaGuid = query.inOrderGuid1,
- query.gw
+ gw = query.gw
};
}
catch (Exception ex)
--
Gitblit v1.9.3