From 662c8acd89bdcbbd92d1b917d6128cbcce0134d7 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期四, 04 十二月 2025 14:42:55 +0800
Subject: [PATCH] 三个检验增加钉钉推送
---
MES.Service/service/QC/RKJService.cs | 92 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index e3d073d..30bfad8 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -87,7 +87,7 @@
decimal? ID = db.Queryable<MesQa>()
.Where(s => s.QsType == "3" && s.ItemNo == itemNo && s.Fsubmit == 1)
- .Select(s=> s.Id)
+ .Select(s => s.Id)
.First();
// 鑾峰彇璐ㄩ噺鏍囧噯
@@ -528,16 +528,19 @@
var query = db
- .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser, Womcaa, SysDepartment,MesUserDepartmentQc, SysUser>((a, b,
+ .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, // 鍏宠仈宸ュ崟淇℃伅
JoinType.Left, da.Daa015 == c.LineNo, // 鍏宠仈宸ュ崟淇℃伅
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, da.Daa021 == ca.Caa020, //浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left,
+ d.Departmentid == Convert.ToDecimal(da.Daa013), //鏌ヨ杞﹂棿
+ JoinType.Left,
+ dq.Departmentcode == d.Departmentcode, //鏌ヨ鐢ㄦ埛鏉冮檺
JoinType.Left, us2.Fcode == a.FcheckBy
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
@@ -553,7 +556,7 @@
(a, b, da, c, us) => a.Fsubmit == 1)
// 鎼滅储鏉′欢锛堢墿鏂欏悕绉�/缂栧彿锛�
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
- (a, b, da, c, us,ca) =>
+ (a, b, da, c, us, ca) =>
b.ItemName.ToLower()
.Contains(queryObj.SearchValue.ToLower()) ||
ca.Caa015.ToLower()
@@ -561,9 +564,10 @@
a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
// 鏂板锛氱敤鎴穋ode杩囨护
.WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
- (a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
+ (a, b, da, c, us, ca, d, dq) =>
+ dq.Usercode == queryObj.LoginUser)
// 鏌ヨ瀛楁
- .Select((a, b, da, c, us, ca,d,dq,us2) => new QsItemOqcReq
+ .Select((a, b, da, c, us, ca, d, dq, us2) => new QsItemOqcReq
{
Id = a.Id,
BillNo = a.BillNo,
@@ -572,13 +576,14 @@
ItemModel = b.ItemModel,
CreateDate = a.CreateDate,
CreateBy = a.CreateBy,
- CreateUser = us.Fname==null ? a.CreateBy: us.Fname,
+ CreateUser = us.Fname == null ? a.CreateBy : us.Fname,
FcheckResu = a.FcheckResu,
- FcheckBy = us2.Fname,//a.FcheckBy,
+ FcheckBy = us2.Fname, //a.FcheckBy,
FcheckDate = a.FcheckDate,
ReleaseNo = a.ReleaseNo,
Remarks = a.Remarks,
- Daa015 = d.Departmentname=="娉ㄥ杞﹂棿" ? da.Daa020:da.Daa015, // 宸ュ崟绾夸綋
+ Daa015 =
+ d.Departmentname == "娉ㄥ杞﹂棿" ? da.Daa020 : da.Daa015, // 宸ュ崟绾夸綋
Fsubmit = a.Fsubmit,
Quantity = da.Daa008,
LineNo = d.Departmentname == "娉ㄥ杞﹂棿" ? da.Daa020 : c.LineName,
@@ -909,17 +914,52 @@
public int IqcQaSubmit(RKJDto dto)
{
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemOqcReq>()
- .SetColumns(a => a.Fsubmit == 1)
- .SetColumns(a => a.FsubmitBy == dto.userNo)
- .SetColumns(a => a.FsubmitDate == DateTime.Now)
- .Where(a => a.ReleaseNo == dto.releaseNo)
- .ExecuteCommand();
- });
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemOqcReq>()
+ .SetColumns(a => a.Fsubmit == 1)
+ .SetColumns(a => a.FsubmitBy == dto.userNo)
+ .SetColumns(a => a.FsubmitDate == DateTime.Now)
+ .Where(a => a.ReleaseNo == dto.releaseNo)
+ .ExecuteCommand();
+ });
- return 0;
+ if (useTransactionWithOracle > 0)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ // 鎴愬姛鎻愪氦鍚庢帹閫侀拤閽夋秷鎭�
+ var qaRkj = db.Queryable<QaRkj>()
+ .Where(s => s.ReleaseNo == dto.releaseNo)
+ .First();
+
+ if (qaRkj != null)
+ {
+ try
+ {
+ var qaMsgDto = new
+ {
+ id = qaRkj.Id,
+ lineName = qaRkj.Daa020,
+ workshopName = qaRkj.Departmentname,
+ qaType = "鍏ュ簱妫�妫�楠屽畬鎴�"
+ };
+
+ // 璋冪敤閽夐拤娑堟伅鎺ㄩ�佹帴鍙�
+ var client = new System.Net.Http.HttpClient();
+ var json = Newtonsoft.Json.JsonConvert.SerializeObject(qaMsgDto);
+ var content = new System.Net.Http.StringContent(json, System.Text.Encoding.UTF8, "application/json");
+ var response = client.PostAsync("http://192.168.0.100:9096/MesQaDingtalk/sendQaMsgRKJ", content).Result;
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍閽夐拤鎺ㄩ�佸紓甯革紝浣嗕笉褰卞搷涓绘祦绋�
+ Console.WriteLine($"閽夐拤娑堟伅鎺ㄩ�佸け璐�: {ex.Message}");
+ }
+ }
+ }
+
+ return useTransactionWithOracle;
}
public int reSubmit(RKJDto dto)
@@ -927,11 +967,11 @@
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();
+ .SetColumns(a => a.Fsubmit == 0)
+ .SetColumns(a => a.FsubmitBy == null)
+ .SetColumns(a => a.FsubmitDate == null)
+ .Where(a => a.ReleaseNo == dto.releaseNo)
+ .ExecuteCommand();
});
return 0;
--
Gitblit v1.9.3