From f2900f2e7a9fef2e536c34e8d8406ac60c0f06ba Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 17 七月 2025 23:36:32 +0800
Subject: [PATCH] 添加首检的查询条件，添加首检，巡检返回总行数
---
StandardInterface/MES.Service/service/QC/LljService.cs | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index d5adec6..6a7e76f 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -65,16 +65,9 @@
.Contains(queryObj.SearchValue.ToLower())
|| a.ItemModel.ToLower()
.Contains(queryObj.SearchValue.ToLower()))
- .OrderByDescending((a, b,
- e, f, g, i) => a.Id)
- //.Select((a, b,
- // e, f, g, i) => new LtsLlj
- // {
- // //UserName = g.Fname,
- // //UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
- // UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname,
- // CreateUserName = e.Fname
- // }, true)
+ // .OrderByDescending((a, b,
+
+ .OrderBy("CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
@@ -318,6 +311,31 @@
return input.Substring(startIndex + 1, length);
}
+ public List<QamftpDto> GetAttachments(string releaseNo)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ return db.Queryable<MesQamftp>()
+ .Where(x => x.ReleaseNo == releaseNo)
+ .OrderBy(x => x.Fdate, OrderByType.Desc)
+ .Select(x => new QamftpDto
+ {
+ Id = x.Id,
+ ItemNo = x.ItemNo,
+ Ftype = x.Ftype,
+ Fattach = x.Fattach,
+ Fversion = x.Fversion,
+ Fdate = x.Fdate,
+ CreateBy = x.CreateBy,
+ CreateDate = x.CreateDate,
+ Company = x.Company,
+ Factory = x.Factory,
+ ReleaseNo = x.ReleaseNo,
+ F_type = x.F_type,
+ LastupdateBy = x.LastupdateBy,
+ LastupdateDate = x.LastupdateDate,
+ ItemId = x.ItemId
+ }).ToList();
+ }
public int saveItem(LLJDto rkjDto)
{
var items = rkjDto.items;
@@ -681,6 +699,7 @@
return db.Updateable<MesQaItemsDetect01>()
.SetColumns(it =>
it.FngDesc == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it => it.PHSY == dto.PHSY)//鐮村潖瀹為獙鏁�
.Where(it => it.ReleaseNo == dto.releaseNo)
.ExecuteCommand();
});
@@ -692,13 +711,11 @@
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(it =>
- it.Funit == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.pid)
- .ExecuteCommand();
- return db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(it =>
- it.Meom == dto.Meom)
+ .SetColumns(it => new MesQaItemsDetectDetail5
+ {
+ Funit = dto.Remarks,
+ Meom = dto.Meom
+ })
.Where(it => it.Id == dto.pid)
.ExecuteCommand();
});
--
Gitblit v1.9.3