From a5019b475f8620dba3b495da983f4db9e32f7ca8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 10 七月 2025 08:18:36 +0800
Subject: [PATCH] AOI
---
MES.Service/service/QC/XJService.cs | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 9ed2beb..5bac98e 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -47,7 +47,7 @@
return db.Queryable<Womdaa>()
.Where(a =>
a.Daa001 == daa001 &&
- statusArray.Contains(a.Daa018))
+ a.Daa018 != "瀹屽伐")
.ToList();
}
@@ -58,10 +58,11 @@
return db.Queryable<Womdaa, MesLine>((a, b) =>
new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
.Where((a, b) => b.LineName != null &&
- statusArray.Contains(a.Daa018))
+ a.Daa018 != "瀹屽伐")
.GroupBy((a, b) => new
{
- b.LineNo, b.LineName
+ b.LineNo,
+ b.LineName
})
.Select((a, b) => new MesLine
{
@@ -78,7 +79,7 @@
.Where((a, b) =>
a.Daa015 == daa020 &&
b.ItemNo == item &&
- statusArray.Contains(a.Daa018))
+ a.Daa018 != "瀹屽伐")
.Select<Womdaa>(a => new Womdaa
{
Id = a.Id,
@@ -93,13 +94,13 @@
var db = SqlSugarHelper.GetInstance();
return db.Queryable<Womdaa, MesItems>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
- .Where((a, b) => statusArray.Contains(a.Daa018) &&
+ .Where((a, b) => a.Daa018 != "瀹屽伐" &&
a.Daa015 == lineNo)
.OrderBy((a, b) => b.ItemName)
.Select<MesItems>((a, b) =>
new MesItems
{
- Id = b.Id,
+ ItemId = b.ItemId,
ItemNo = b.ItemNo,
ItemName = b.ItemName,
ItemModel = b.ItemModel
@@ -137,6 +138,7 @@
!"鏈畬鎴�".Equals(queryObj.result),
(s, a, c, b) => s.FcheckResu != null)
.WhereIF(id > 0, (s, a, c, b) => s.Id == id)
+ //.WhereIF(queryObj.Comments != null, (s, a, c, b) => s.Comments == queryObj.Comments)
.Select((s, a, c, b) => new QsQaItemXj
{
Daa020 = c.LineNo,
@@ -151,7 +153,8 @@
ItemModel = b.ItemModel,
FcheckBy = s.FcheckBy,
FcheckResu = s.FcheckResu,
- Remarks = s.Remarks
+ Remarks = s.Remarks,
+ Comments = s.Comments
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
@@ -161,15 +164,13 @@
{
var db = SqlSugarHelper.GetInstance();
- var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ var count = db.Queryable<MesQa>().Where(s => s.QsType == "2" && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
if (count <= 0) return new List<QsQaItemXj01>();
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "2"
- && b.ItemNo == itemNo).Select(
+ .Where(b => b.QsType == "2" && b.ItemNo == itemNo).Select(
b => new QsQaItemXj01
{
ProjName = b.ProjName,
@@ -503,6 +504,19 @@
});
}
+
+ public int saveCommentGid(XJDto dto)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsQaItemXj>()
+ .SetColumns(it =>
+ it.Comments == dto.Comments) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .Where(it => it.Id == dto.gid)
+ .ExecuteCommand();
+ });
+ }
+
//瀛愯〃淇敼澶囨敞瀛楁
public int saveRemarksPid(XJDto dto)
{
--
Gitblit v1.9.3