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/RKJService.cs | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 981d359..e3d073d 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -528,8 +528,8 @@
var query = db
- .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa, SysDepartment,MesUserDepartmentQc>((a, b,
- da, c, us, ca, d, dq) =>
+ .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser, Womcaa, SysDepartment,MesUserDepartmentQc, SysUser>((a, b,
+ da, c, us, ca, d, dq, us2) =>
new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo, // 鍏宠仈鐗╂枡淇℃伅
JoinType.Left, a.BillNo == da.Daa001, // 鍏宠仈宸ュ崟淇℃伅
@@ -537,7 +537,8 @@
JoinType.Left, us.Fcode == a.CreateBy, // 鍏宠仈宸ュ崟淇℃伅
JoinType.Left, da.Daa021 == ca.Caa020,//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//鏌ヨ杞﹂棿
- JoinType.Left, dq.Departmentcode == d.Departmentcode//鏌ヨ鐢ㄦ埛鏉冮檺
+ JoinType.Left, dq.Departmentcode == d.Departmentcode,//鏌ヨ鐢ㄦ埛鏉冮檺
+ JoinType.Left, us2.Fcode == a.FcheckBy
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
//.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -562,7 +563,7 @@
.WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
(a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
// 鏌ヨ瀛楁
- .Select((a, b, da, c, us, ca,d,dq) => new QsItemOqcReq
+ .Select((a, b, da, c, us, ca,d,dq,us2) => new QsItemOqcReq
{
Id = a.Id,
BillNo = a.BillNo,
@@ -571,16 +572,16 @@
ItemModel = b.ItemModel,
CreateDate = a.CreateDate,
CreateBy = a.CreateBy,
- CreateUser = us.Fname,
+ CreateUser = us.Fname==null ? a.CreateBy: us.Fname,
FcheckResu = a.FcheckResu,
- FcheckBy = a.FcheckBy,
+ FcheckBy = us2.Fname,//a.FcheckBy,
FcheckDate = a.FcheckDate,
ReleaseNo = a.ReleaseNo,
Remarks = a.Remarks,
- Daa015 = da.Daa015, // 宸ュ崟绾夸綋
+ Daa015 = d.Departmentname=="娉ㄥ杞﹂棿" ? da.Daa020:da.Daa015, // 宸ュ崟绾夸綋
Fsubmit = a.Fsubmit,
Quantity = da.Daa008,
- LineNo = c.LineName,
+ LineNo = d.Departmentname == "娉ㄥ杞﹂棿" ? da.Daa020 : c.LineName,
SaleOrderNo = ca.Caa015,
DepartName = d.Departmentname
})
@@ -921,6 +922,21 @@
return 0;
}
+ public int reSubmit(RKJDto dto)
+ {
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemOqcReq>()
+ .SetColumns(a => a.Fsubmit == 0)
+ .SetColumns(a => a.FsubmitBy == null)
+ .SetColumns(a => a.FsubmitDate == null)
+ .Where(a => a.ReleaseNo == dto.releaseNo)
+ .ExecuteCommand();
+ });
+
+ return 0;
+ }
+
// 澶囦唤锛氬師濮嬬増鏈殑saveItem鏂规硶
public int saveItemOriginal(RKJDto rkjDto)
{
--
Gitblit v1.9.3