From f53ddc0903c524e50959aeabfb6b93a6098fec8c Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期一, 21 四月 2025 08:47:59 +0800 Subject: [PATCH] 1.生产退库后台 --- service/QC/LljService.cs | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs index 64015c2..4838160 100644 --- a/service/QC/LljService.cs +++ b/service/QC/LljService.cs @@ -1,9 +1,11 @@ -锘縰sing Microsoft.IdentityModel.Tokens; +锘縰sing MES.Service.Models; +using Microsoft.IdentityModel.Tokens; using NewPdaSqlServer.DB; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using NewPdaSqlServer.util; using SqlSugar; +using static Azure.Core.HttpHeader; namespace NewPdaSqlServer.service.QC; @@ -41,7 +43,8 @@ a.SuppName.Contains(queryObj.keyword) ) .WhereIF(UtilityHelper.CheckGuid(parsedGuid), - a => a.guid == parsedGuid && (a.fsubmit ?? 0) == 0) + a => a.guid == parsedGuid ) + .Where(a => (a.fsubmit ?? 0) == 0) .OrderByDescending(a => a.CreateDate) .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); @@ -68,7 +71,7 @@ FcheckItem = b.FcheckItem, FdownAllow = b.FdownAllow, FcheckLevel = b.FREQUENCY, - Fstand = Convert.ToInt32(b.FSTAND), + Fstand = b.FSTAND, FupAllow = b.FupAllow, SampleSizeNo = b.SampleSizeNo, FenterQty = 0, @@ -228,7 +231,9 @@ a.FspecRequ, a.FreQty, a.CheckQyt, - a.FcheckResu + a.FcheckResu, + a.Order, + a.Ybsl }).Select((a, b) => new MesQaItemsDetectDetail5 { Guid = a.Guid, @@ -248,8 +253,11 @@ Factory = "1000", Company = "1000", FenterQty = SqlFunc.AggregateCount(b.Guid), - FcheckResu = a.FcheckResu - }).ToList(); + FcheckResu = a.FcheckResu, + Order = a.Order, + Ybsl = a.Ybsl, + }).OrderBy(a => a.Order) + .ToList(); } public int SetQSItemDetail(MesQaItemsDetectDetail12 detail) @@ -716,4 +724,27 @@ return [isNullCount, isNotNullCount]; } + + + + //鍒犻櫎鐗瑰緛鍊� + public int deleteDetail13(LLJDto dto) + { + var withOracle = Db.Deleteable<MesQaItemsDetectDetail13>() + .Where(s => s.Guid.ToString() == dto.id13) + .ExecuteCommand(); + + return withOracle; + } + + //鏇存柊涓嶅悎鏍兼弿杩� + public int updateRemarks(LLJDto dto) + { + var withOracle = Db.Updateable<MesQaItemsDetect01>() + .SetColumns(s => s.Remarks == dto.Remarks) + .Where(s => s.Guid.ToString() == dto.gid) + .ExecuteCommand(); + + return withOracle; + } } \ No newline at end of file -- Gitblit v1.9.3