From 97dfa436fea3311b0874e86b973333ccc3cd68a1 Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期四, 22 五月 2025 15:13:18 +0800 Subject: [PATCH] 1.采购入库新增检验防呆。 2.接收oa实体调整 --- service/QC/IpqcService.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs index d238f10..58c47fb 100644 --- a/service/QC/IpqcService.cs +++ b/service/QC/IpqcService.cs @@ -6,6 +6,7 @@ using NewPdaSqlServer.util; using SqlSugar; using static Azure.Core.HttpHeader; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory; namespace NewPdaSqlServer.service.QC; @@ -83,7 +84,8 @@ a.FcheckResu, a.Order, a.Ybsl, - a.YbslIn + a.ISRZXX, + a.IPQCRZXX }).Select((a, b) => new MesQaItemsDetectDetail5 { Guid = a.Guid, @@ -107,7 +109,59 @@ 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; + } } \ No newline at end of file -- Gitblit v1.9.3