From 2923b57174c59c6b07e3ac7502c41fa60e32ae33 Mon Sep 17 00:00:00 2001 From: 如洲 陈 <1278080563@qq.com> Date: 星期五, 09 五月 2025 17:49:20 +0800 Subject: [PATCH] 入库、首检、巡检 --- MES.Service/service/QC/XJService.cs | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs index cc2ff82..411d623 100644 --- a/MES.Service/service/QC/XJService.cs +++ b/MES.Service/service/QC/XJService.cs @@ -61,7 +61,8 @@ a.Daa018 != "瀹屽伐") .GroupBy((a, b) => new { - b.LineNo, b.LineName + b.LineNo, + b.LineName }) .Select((a, b) => new MesLine { @@ -137,6 +138,7 @@ !"鏈畬鎴�".Equals(queryObj.result), (s, a, c, b) => s.FcheckResu != null) .WhereIF(id > 0, (s, a, c, b) => s.Id == id) + //.WhereIF(queryObj.Comments != null, (s, a, c, b) => s.Comments == queryObj.Comments) .Select((s, a, c, b) => new QsQaItemXj { Daa020 = c.LineNo, @@ -151,7 +153,8 @@ ItemModel = b.ItemModel, FcheckBy = s.FcheckBy, FcheckResu = s.FcheckResu, - Remarks = s.Remarks + Remarks = s.Remarks, + Comments = s.Comments }).OrderBy(s => s.CreateDate, OrderByType.Desc) .ToPageList(queryObj.PageIndex, queryObj.Limit); } @@ -503,6 +506,19 @@ }); } + + public int saveCommentGid(XJDto dto) + { + return SqlSugarHelper.UseTransactionWithOracle(db => + { + return db.Updateable<QsQaItemXj>() + .SetColumns(it => + it.Comments == dto.Comments) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊� + .Where(it => it.Id == dto.gid) + .ExecuteCommand(); + }); + } + //瀛愯〃淇敼澶囨敞瀛楁 public int saveRemarksPid(XJDto dto) { -- Gitblit v1.9.3