From 41975878bf0b8d3632d8c5f21714502a57632070 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 23 七月 2025 16:08:39 +0800
Subject: [PATCH] 紧急放行修改
---
StandardInterface/MES.Service/service/QC/LljService.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 08a075a..0bd98f5 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -67,7 +67,7 @@
.Contains(queryObj.SearchValue.ToLower()))
// .OrderByDescending((a, b,
- .OrderBy("CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
+ .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);
var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
@@ -311,9 +311,9 @@
return input.Substring(startIndex + 1, length);
}
- public List<QamftpDto> GetAttachments(string releaseNo)
+ public List<QamftpDto> GetAttachments(string ItemNo)
{
- if (string.IsNullOrEmpty(releaseNo))
+ if (string.IsNullOrEmpty(ItemNo))
{
throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
}
@@ -322,13 +322,13 @@
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 +337,7 @@
CreateDate = x.CreateDate,
Company = x.Company,
Factory = x.Factory,
- ReleaseNo = x.ReleaseNo,
+
F_type = x.F_type,
LastupdateBy = x.LastupdateBy,
LastupdateDate = x.LastupdateDate,
--
Gitblit v1.9.3