From 52f26a9f94f639d994a8300d100161acf5e1d0c3 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期一, 18 八月 2025 14:08:51 +0800
Subject: [PATCH] 检验
---
StandardInterface/MES.Service/service/QC/LljService.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 0bd98f5..2e9fae5 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -45,7 +45,7 @@
e, f, g, i) => a.FcheckResu != null)
.WhereIF(id > 0, (a, b,
e, f, g, i) => a.Id == id)
- .WhereIF(queryObj.createUser != "PL017" && queryObj.UserIndex == "0", (a, b,
+ .WhereIF(queryObj.createUser != "PL017" && queryObj.createUser != "HMLYY" && queryObj.UserIndex == "0", (a, b,
e, f, g, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser ||
(g.Fcode == null && i.Fcode == null)))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹�
@@ -68,8 +68,20 @@
// .OrderByDescending((a, b,
.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);
+ .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);
}
@@ -313,10 +325,10 @@
public List<QamftpDto> GetAttachments(string ItemNo)
{
- if (string.IsNullOrEmpty(ItemNo))
- {
- throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
- }
+ //if (string.IsNullOrEmpty(ItemNo))
+ //{
+ // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+ //}
var db = SqlSugarHelper.GetInstance();
try
@@ -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