From 82dac540156cb29e58c86f7d7d840e3c7e548c15 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 14 八月 2025 19:55:41 +0800
Subject: [PATCH] 来料检，入库检，首检巡检。
---
StandardInterface/MES.Service/service/QC/LljService.cs | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 08a075a..78ba1fb 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -67,9 +67,21 @@
.Contains(queryObj.SearchValue.ToLower()))
// .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);
+ .OrderBy("CASE WHEN a.EMERGENCY = 1 THEN 0 ELSE 1 END, CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ // 涓烘瘡涓楠屽崟娣诲姞妫�楠岄」鐩暟閲忎俊鎭�
+ foreach (var item in pageList)
+ {
+ // 鑾峰彇璇ユ楠屽崟鐨勬楠岄」鐩暟閲�
+ var itemCount = db.Queryable<MesQaItemsDetectDetail5>()
+ .Where(x => x.ReleaseNo == item.ReleaseNo)
+ .Count();
+
+ // 璁剧疆妫�楠岄」鐩暟閲�
+ item.InspectionItemCount = itemCount;
+ }
+
var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
return (pageList, totalCount);
}
@@ -311,24 +323,24 @@
return input.Substring(startIndex + 1, length);
}
- public List<QamftpDto> GetAttachments(string releaseNo)
+ public List<QamftpDto> GetAttachments(string ItemNo)
{
- if (string.IsNullOrEmpty(releaseNo))
- {
- throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
- }
+ //if (string.IsNullOrEmpty(ItemNo))
+ //{
+ // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+ //}
var db = SqlSugarHelper.GetInstance();
try
{
return db.Queryable<MesQamftp>()
- .Where(x => x.ReleaseNo == releaseNo)
+ .Where(x => x.ItemNo == ItemNo)
.OrderBy(x => x.Fdate, OrderByType.Desc)
// .ThenBy(x => x.CreateDate, OrderByType.Desc)
.Select(x => new QamftpDto
{
Id = x.Id,
- ItemNo = x.ItemNo,
+ itemNo = x.ItemNo,
Ftype = x.Ftype,
Fattach = x.Fattach,
Fversion = x.Fversion,
@@ -337,7 +349,7 @@
CreateDate = x.CreateDate,
Company = x.Company,
Factory = x.Factory,
- ReleaseNo = x.ReleaseNo,
+
F_type = x.F_type,
LastupdateBy = x.LastupdateBy,
LastupdateDate = x.LastupdateDate,
@@ -861,20 +873,41 @@
return withOracle;
}
- //涓昏〃淇敼澶囨敞瀛楁
+ //涓昏〃淇敼瀛楁
public int saveRemarksGid(LLJDto dto)
{
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetect01>()
- .SetColumns(it =>
- it.FngDesc == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .SetColumns(it => it.PHSY == dto.PHSY)//鐮村潖瀹為獙鏁�
+ .SetColumns(it => it.FngDesc == dto.Remarks)
.Where(it => it.ReleaseNo == dto.releaseNo)
.ExecuteCommand();
});
}
-
+ //涓昏〃淇敼鐮村潖瀹為獙
+ public int savePhsyGid(LLJDto dto)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<MesQaItemsDetect01>()
+ .SetColumns(it => it.PHSY == dto.PHSY)
+ .Where(it => it.ReleaseNo == dto.releaseNo)
+ .ExecuteCommand();
+ });
+ }
+ // 涓昏〃淇敼涓嬫媺妗嗗瓧娈�
+ public int saveDropdownFields(LLJDto dto)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<MesQaItemsDetect01>()
+ .SetColumns(it => it.BLYY == dto.BLYY)
+ .SetColumns(it => it.PSZT == dto.PSZT)
+ .SetColumns(it => it.SSCJ == dto.SSCJ)
+ .Where(it => it.ReleaseNo == dto.releaseNo)
+ .ExecuteCommand();
+ });
+ }
//瀛愯〃淇敼澶囨敞瀛楁
public int saveRemarksPid(LLJDto dto)
{
--
Gitblit v1.9.3