From 971e03ccbe5124d4761f56e71025453d1d4742bc Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 14:17:08 +0800
Subject: [PATCH] 111
---
service/QC/LljService.cs | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index 55ca00f..5d687f7 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -1,9 +1,12 @@
-锘縰sing Microsoft.IdentityModel.Tokens;
+锘縰sing MES.Service.Models;
+using Microsoft.IdentityModel.Tokens;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using static Azure.Core.HttpHeader;
namespace NewPdaSqlServer.service.QC;
@@ -32,15 +35,16 @@
// StringUtil.IsNotNullOrEmpty(queryObj.result) &&
// !"鏈畬鎴�".Equals(queryObj.result),
// a => (a.STATUS ?? "") == "宸叉彁浜�")
+
.WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a =>
a.ItemNo.Contains(queryObj.keyword) ||
a.ItemName.Contains(queryObj.keyword) ||
a.LotNo.Contains(queryObj.keyword) ||
a.ReleaseNo.Contains(queryObj.keyword) ||
- a.SuppName.Contains(queryObj.keyword)
+ a.SuppName.Contains(queryObj.keyword)
)
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- a => a.guid == parsedGuid)
+ a => a.guid == parsedGuid )
.Where(a => (a.fsubmit ?? 0) == 0)
.OrderByDescending(a => a.CreateDate)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -60,8 +64,8 @@
var mesQaIqcItem = Db
.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemId == itemId && s.FTYPE == "1").Select(b =>
- new MesQaItemsDetectDetail5
+ && s.ItemId == itemId && s.FTYPE == "1").Select(
+ b => new MesQaItemsDetectDetail5
{
ReleaseNo = releaseNo,
FacLevel = b.FacLevel,
@@ -233,6 +237,7 @@
var Ybsl_In = Db.Ado.SqlQuery<MesQaItemsDetectDetail5>(sql).ToList();
return Ybsl_In;
+
}
public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
@@ -253,8 +258,7 @@
result.Add(item);
}
- return db.Insertable(result).PageSize(1).IgnoreColumnsNull()
- .ExecuteCommand();
+ return db.Insertable(result).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
});
detail.CreateBy = detail.LastupdateBy;
@@ -299,21 +303,19 @@
// result = "涓嶅悎鏍�";
else if (noCount >= QsItemOqcItem.FreQty)
result = "涓嶅悎鏍�";
- var useTransactionWithOracle = UseTransaction(db =>
- {
- var commit = 0;
- commit += db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(s => s.FcheckResu == result)
- .SetColumns(s => s.FenterQty == count)
- .SetColumns(s => s.FngRate == (s.CheckQyt == 0
- ? null
- : (decimal?)(Convert.ToDouble(noCount) /
- Convert.ToDouble(count))))
- .Where(s => s.Guid == detail.ParentGuid)
- .ExecuteCommand();
+ var useTransactionWithOracle = UseTransaction(
+ db =>
+ {
+ var commit = 0;
+ commit += db.Updateable<MesQaItemsDetectDetail5>()
+ .SetColumns(s => s.FcheckResu == result)
+ .SetColumns(s => s.FenterQty == count)
+ .SetColumns(s => s.FngRate == (s.CheckQyt == 0 ? (decimal?)null : (decimal?)(Convert.ToDouble(noCount) / Convert.ToDouble(count))))
+ .Where(s => s.Guid == detail.ParentGuid)
+ .ExecuteCommand();
- return commit;
- });
+ return commit;
+ });
var isNull = Db.Queryable<MesQaItemsDetectDetail5>()
.Where(s => s.Guid == detail.ParentGuid && s.FcheckResu == null)
@@ -638,8 +640,8 @@
.ExecuteCommand();
var first = db
- .Queryable<MesInvItemArnDetail, MesInvItemArn>((b, a) =>
- new object[]
+ .Queryable<MesInvItemArnDetail, MesInvItemArn>(
+ (b, a) => new object[]
{
JoinType.Left, b.ParentGuid == a.Guid
})
@@ -668,8 +670,8 @@
executeCommand += db.Updateable<MesInvItemArnDetail>()
.SetColumns(s => s.CheckStates == "涓嶅悎鏍煎緟瀹℃壒")
.SetColumns(s => s.Ischeck == 1)
- .SetColumns(s =>
- s.CheckRes == mesQaItemsDetect01.FcheckResu)
+ .SetColumns(
+ s => s.CheckRes == mesQaItemsDetect01.FcheckResu)
.SetColumns(s => s.CheckDate == DateTime.Now)
.Where(s => s.ParentGuid == mesInvItemArn.Guid
&& s.ItemId == mesQaItemsDetect01.ItemId)
@@ -704,12 +706,13 @@
}
+
//鍒犻櫎鐗瑰緛鍊�
public int deleteDetail13(LLJDto dto)
{
var withOracle = Db.Deleteable<MesQaItemsDetectDetail13>()
- .Where(s => s.Guid.ToString() == dto.id13)
- .ExecuteCommand();
+ .Where(s => s.Guid.ToString() == dto.id13)
+ .ExecuteCommand();
return withOracle;
}
@@ -718,9 +721,9 @@
public int updateRemarks(LLJDto dto)
{
var withOracle = Db.Updateable<MesQaItemsDetect01>()
- .SetColumns(s => s.FngDesc == dto.Remarks)
- .Where(s => s.Guid.ToString() == dto.gid)
- .ExecuteCommand();
+ .SetColumns(s => s.FngDesc == dto.Remarks)
+ .Where(s => s.Guid.ToString() == dto.gid)
+ .ExecuteCommand();
return withOracle;
}
--
Gitblit v1.9.3