From 4ef0acfc95e9e654ae142f8d5b21d68c55ddfc8d Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期二, 27 五月 2025 10:37:04 +0800 Subject: [PATCH] 1.巡检新增扫描工单获取检验信息 --- service/QC/IpqcService.cs | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 1 deletions(-) diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs index d238f10..3165c8d 100644 --- a/service/QC/IpqcService.cs +++ b/service/QC/IpqcService.cs @@ -5,7 +5,10 @@ using NewPdaSqlServer.entity; using NewPdaSqlServer.util; using SqlSugar; +using System.Data; +using System.Data.SqlClient; using static Azure.Core.HttpHeader; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory; namespace NewPdaSqlServer.service.QC; @@ -83,7 +86,8 @@ a.FcheckResu, a.Order, a.Ybsl, - a.YbslIn + a.ISRZXX, + a.IPQCRZXX }).Select((a, b) => new MesQaItemsDetectDetail5 { Guid = a.Guid, @@ -107,7 +111,116 @@ Order = a.Order, Ybsl = a.Ybsl, YbslIn = Ybsl_In, + ISRZXX = a.ISRZXX, + IPQCRZXX = a.IPQCRZXX }).OrderBy(a => a.Order) .ToList(); } + + + public (List<VIpqcXj> item, int TotalCount) getPageXj(XJPageResult queryObj) + { + var parsedGuid = Guid.Empty; + if (!queryObj.id.IsNullOrEmpty()) + { + var isValid = Guid.TryParse(queryObj.id, out parsedGuid); + if (!isValid) + throw new ApplicationException("GUID杞崲閿欒"); + } + + + var totalCount = 0; + + var pageList = Db.Queryable<VIpqcXj>() + .WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a => + a.ItemNo.Contains(queryObj.keyword) || + 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) + ) + .WhereIF(UtilityHelper.CheckGuid(parsedGuid), + a => a.Guid == parsedGuid.ToString()) + .Where(a => (a.FSubmit ?? 0) == 0) + .OrderByDescending(a => a.CreateDate) + .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); + + return (pageList, totalCount); + } + + + //鏇存柊涓嶅悎鏍兼弿杩� + public int updateIpqcRzxx(LLJDto dto) + { + if (dto == null) throw new ArgumentNullException(nameof(dto), "鍙傛暟瀵硅薄涓嶈兘涓� null"); + + // 鍙傛暟鏍¢獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級 + if (string.IsNullOrEmpty(dto.pid?.ToString())) + throw new ArgumentException("椤圭洰鏄庣粏id瀛樺湪闂锛岃鑱旂郴绠$悊鍛橈紒", nameof(dto.pid)); + + var withOracle = Db.Updateable<MesQaItemsDetectDetail5>() + .SetColumns(s => s.IPQCRZXX == dto.inRzxxValue) + .Where(s => s.Guid.ToString() == dto.pid) + .ExecuteCommand(); + + return withOracle; + } + + + public dynamic CreateByWomdaa(dynamic query) +{ + if (query == null) throw new ArgumentNullException(nameof(query)); + + if (string.IsNullOrEmpty(query.userAccount?.ToString())) + throw new ArgumentException("鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖", nameof(query.userAccount)); + + if (string.IsNullOrEmpty(query.inOrderGuid1?.ToString())) + throw new ArgumentException("妫�楠屽崟GUID涓嶈兘涓虹┖", nameof(query.inOrderGuid1)); + + if (string.IsNullOrEmpty(query.DAA001?.ToString())) + throw new ArgumentException("宸ュ崟鍙蜂笉鑳戒负绌�", nameof(query.inOrderGuid1)); + + var _strMsg = ""; + var _status = -1; + + using (var conn = new SqlConnection(DbHelperSQL.strConn)) + using (var cmd = new SqlCommand("ipqc_createByWomdaa", conn)) + { + try + { + conn.Open(); + cmd.CommandType = CommandType.StoredProcedure; + + 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 } + }; + + cmd.Parameters.AddRange(parameters); + cmd.ExecuteNonQuery(); + + _strMsg = parameters[0].Value?.ToString() ?? ""; + _status = Convert.ToInt32(parameters[1].Value ?? -1); + + if (_status <= 0) throw new Exception(_strMsg); + + return new + { + message = _strMsg, + status = _status + }; + } + catch (Exception ex) + { + throw new Exception($"妫�楠屽崟鏇存柊澶辫触锛歿ex.Message}"); + } + } +} } \ No newline at end of file -- Gitblit v1.9.3