From f31edb8fa31c6608d34d303e750890f7eea1930b Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 26 八月 2025 14:08:02 +0800
Subject: [PATCH] 首检获取检验项目前 删除原有检验项
---
MES.Service/service/QC/XJService.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index deed3d0..5a900e3 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -123,12 +123,14 @@
var query = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems, SysUser>((s, a, c, b, us) =>
+ MesItems, SysUser,Womcaa,SysDepartment>((s, a, c, b, us,ca,d) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, a.Daa015 == c.LineNo,
JoinType.Left, s.ItemId == b.Id,
- JoinType.Left, us.Fcode == s.CreateBy
+ JoinType.Left, us.Fcode == s.CreateBy,
+ JoinType.Left, ca.Caa020 == a.Daa021,
+ JoinType.Left, d.Departmentcode == c.Departmentcode
)
)
//.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -142,8 +144,8 @@
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
(s, a, c, b, us) => s.SubmitStatus == 1)
- .WhereIF(id > 0, (s, a, c, b, us) => s.Id == id)
- .Select((s, a, c, b, us) => new QsQaItemXj
+ .WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
+ .Select((s, a, c, b, us,ca) => new QsQaItemXj
{
Daa020 = c.LineNo,
Id = s.Id,
@@ -159,7 +161,8 @@
ItemModel = b.ItemModel,
CheckBy = s.CheckBy,
CheckResult = s.CheckResult,
- Remarks = s.Remarks
+ Remarks = s.Remarks,
+ SaleOrder = ca.Caa015
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
ref totalCount);
@@ -686,6 +689,18 @@
.ExecuteCommand();
});
}
+
+ public int saveNotesPid(XJDto dto)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsQaItemXj01>()
+ .SetColumns(it =>
+ it.Notes == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .Where(it => it.Id == dto.pid)
+ .ExecuteCommand();
+ });
+ }
//瀛欒〃淇敼澶囨敞瀛楁
public int saveRemarksById(XJDto dto)
--
Gitblit v1.9.3