From d7f491034ae9694741178f17f809143f48470520 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期四, 27 十一月 2025 13:12:19 +0800
Subject: [PATCH] 钉钉人员接口、检验撤回单据、首检保存备注
---
MES.Service/service/QC/XJService.cs | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 9af8b55..d549e02 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -161,7 +161,7 @@
var query = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
+ MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems, SysUser>((s, a, c, b, us,ca,d,dq,i,us2) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, a.Daa015 == c.LineNo,
@@ -170,7 +170,8 @@
JoinType.Left, ca.Caa020 == a.Daa021,
JoinType.Left, d.Departmentcode == c.Departmentcode,
JoinType.Left, dq.Departmentcode == d.Departmentcode,//鏌ヨ鐢ㄦ埛鏉冮檺
- JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
+ JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002),
+ JoinType.Left, us2.Fcode == s.SubmitBy
)
)
//.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -193,13 +194,13 @@
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
+ .Select((s, a, c, b, us,ca,d,dq,i,us2) => new QsQaItemXj
{
Daa020 = c.LineNo,
Id = s.Id,
PlanQty = a.Daa008,
- LineName = c.LineName,
- CreateUser = us.Fname,
+ LineName = d.Departmentname == "娉ㄥ杞﹂棿" ? a.Daa020:c.LineName,
+ CreateUser = us.Fname==null ? s.CreateBy : us.Fname,
CreateBy = s.CreateBy,
CreateDate = s.CreateDate,
ReleaseNo = s.ReleaseNo,
@@ -212,7 +213,10 @@
Remarks = s.Remarks,
SaleOrder = ca.Caa015,
DepartName = d.Departmentname,
- PlanName = s.PlanName
+ PlanName = s.PlanName,
+ fcheckBy = us2.Fname,
+ SubmitDate= s.SubmitDate,
+ SubmitStatus = s.SubmitStatus
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
@@ -396,6 +400,23 @@
return useTransactionWithOracle > 0;
}
+
+ public bool XJReSubmit(LLJDto rkjDto)
+ {
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsQaItemXj>()
+ .SetColumns(s => s.SubmitStatus == 0)
+ .SetColumns(s => s.SubmitBy == null)
+ .SetColumns(s => s.SubmitDate == null)
+ .Where(s => s.Id == rkjDto.gid)
+ .ExecuteCommand();
+ });
+
+ return useTransactionWithOracle > 0;
+ }
+
// public int saveItem(XJDto xjDto)
// {
// var items = xjDto.items;
--
Gitblit v1.9.3