From 6e46268eac9b697f26a77d316d22ca1019ed3ab1 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期五, 29 八月 2025 14:14:31 +0800
Subject: [PATCH] 巡检生成检验项目优化
---
MES.Service/service/QC/XJService.cs | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 5a900e3..69eecc0 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -123,14 +123,16 @@
var query = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems, SysUser,Womcaa,SysDepartment>((s, a, c, b, us,ca,d) =>
+ MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
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, ca.Caa020 == a.Daa021,
- JoinType.Left, d.Departmentcode == c.Departmentcode
+ JoinType.Left, d.Departmentcode == c.Departmentcode,
+ JoinType.Left, dq.Departmentcode == d.Departmentcode,//鏌ヨ鐢ㄦ埛鏉冮檺
+ JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
)
)
//.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -145,7 +147,15 @@
!"鏈畬鎴�".Equals(queryObj.result),
(s, a, c, b, us) => s.SubmitStatus == 1)
.WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
- .Select((s, a, c, b, us,ca) => new QsQaItemXj
+ .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
+ (s, a, c, b, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ (s, a, c, b, us, ca, d, dq,i) =>
+ s.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ i.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .Select((s, a, c, b, us,ca,d) => new QsQaItemXj
{
Daa020 = c.LineNo,
Id = s.Id,
@@ -162,7 +172,9 @@
CheckBy = s.CheckBy,
CheckResult = s.CheckResult,
Remarks = s.Remarks,
- SaleOrder = ca.Caa015
+ SaleOrder = ca.Caa015,
+ DepartName = d.Departmentname
+
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
ref totalCount);
@@ -352,6 +364,17 @@
var items = xjDto.items;
var userNo = xjDto.userNo;
+ var db = SqlSugarHelper.GetInstance();
+
+ var del = db.Deleteable<QsQaItemXj01>()
+ .Where(s => s.Pid == xjDto.gid)
+ .ExecuteCommand();
+
+ //QsItemIpiItemDetail
+ var del1 = db.Deleteable<QsQaItemXj02>()
+ .Where(s => s.Gid == xjDto.gid)
+ .ExecuteCommand();
+
// 鏁版嵁楠岃瘉
var validationResult = ValidateItemsData(items);
if (!validationResult.isValid)
--
Gitblit v1.9.3