From bad4badaa36382cd3ff2e7fd766a26dadd26645b Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 08 五月 2025 18:59:31 +0800
Subject: [PATCH] 推送异常处置单逻辑完成
---
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 19 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
index 236aa3f..ae118a1 100644
--- a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
+++ b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -28,7 +28,7 @@
//寮傚父澶勭疆鍗曠粨鏋滆〃
[SugarTable("MES_QA_ITEMS_DETECT_01")]
-public class QcIssueResultManager: Repository<QcIssueResults>
+public class QcIssueResultManager : Repository<QcIssueResults>
{
/**
* 浣跨敤 Token 鍒濆鍖栬处鍙稢lient
@@ -118,9 +118,9 @@
}
catch (TeaException err)
{
-
- return $"TeaException: Code={err.Code}, Message={err.Message}";
-
+
+ return $"TeaException: Code={err.Code}, Message={err.Message}";
+
}
catch (Exception _err)
{
@@ -132,7 +132,7 @@
* 鑾峰彇userid
* @return string 杩斿洖鍚姩缁撴灉
*/
- public HttpClient _httpClient;
+ public HttpClient _httpClient;
public string DingTalkService()
{
_httpClient = new HttpClient();
@@ -153,7 +153,7 @@
return await GetUserIdByMobile(accessToken, phone);
}
-
+
public async Task<string> GetUserIdByMobile(string accessToken, string mobile)
{
@@ -255,7 +255,7 @@
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues2 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "TextField_1LW382XRH1DS0",
- Value = getQcIssueResultDetail.ItemName ,
+ Value = getQcIssueResultDetail.ItemName,
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues3 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
@@ -286,7 +286,7 @@
{
Name = "InnerContactField_WVZLUIPZ9J40",
Value = applicationUser,
-
+
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues9 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
@@ -404,15 +404,38 @@
/**
* 灏嗗甫鏈夋祦绋嬪彿鍜屾楠屽崟鍙风殑鏂拌褰曟彃鍏ヨ〃涓�
*/
- public dynamic SaveProcessNo(string ReleaseNo,string ProcessNo)
+ public dynamic SaveProcessNo(string ReleaseNo, string ProcessNo, string StaffNo, string Department)
{
-
var QcIssueResults = GetQcIssueResults(ReleaseNo, ProcessNo);
+
+ var ApplicantResults = GetApplicantResults(ProcessNo, StaffNo);
+
+ var DepartmentResults = GetDepartmentResults(ProcessNo, Department);
+
+ var db = SqlSugarHelper.GetInstance();
+
+ db.Insertable(ApplicantResults).ExecuteCommand(); // 鎻掑叆鐢宠浜烘暟鎹�
+ db.Insertable(DepartmentResults).ExecuteCommand(); // 鎻掑叆閮ㄩ棬鏁版嵁
return UseTransaction(db =>
{
- return SaveOrUpdateData(db, QcIssueResults) ? 1 : 0;
- }) > 0;
+ try
+ {
+
+
+ // 缁熶竴浣跨敤浜嬪姟db
+ //SaveOrUpdateApplicantData(db, ApplicantResults);
+ //SaveOrUpdateDepartmentData(db, DepartmentResults);
+ SaveOrUpdateData(db, QcIssueResults);
+
+ return 1;
+ }
+ catch
+ {
+ db.RollbackTran();
+ throw;
+ }
+ });
}
public QcIssueResults GetQcIssueResults(string ReleaseNo, string ProcessNo)
@@ -425,6 +448,41 @@
};
return QcIssueResults;
+ }
+
+ public IqcApplicant GetApplicantResults(string ProcessNo, string StaffNo)
+ {
+ var db = SqlSugarHelper.GetInstance();
+
+ var stafflist = db.Queryable<DingNameCode>()
+ .Where(t => t.STAFF_NO == StaffNo)
+ .Select(t => new DingNameCode
+ {
+ STAFF_NAME = t.STAFF_NAME,
+ PHONE_NUMBER = t.PHONE_NUMBER
+ })
+ .ToList();
+
+ var ApplicantResults = new IqcApplicant
+ {
+ INSTANCEID = ProcessNo,
+ APPLICANTID = StaffNo,
+ APPLICANTNAME = stafflist[0].STAFF_NAME
+ };
+
+ return ApplicantResults;
+ }
+
+ public IqcDepartment GetDepartmentResults(string ProcessNo, string Department)
+ {
+
+ var DepartmentResults = new IqcDepartment
+ {
+ INSTANCEID = ProcessNo,
+ DEPARTMENTNAME = Department
+ };
+
+ return DepartmentResults;
}
/**
@@ -466,10 +524,10 @@
BELONGINGWORKSHOP = erpQcIssueResult.AffiliatedWorkshop,
REVIEWSTATUS = erpQcIssueResult.FReview,
QcStatu = erpQcIssueResult.QcStatus,
- ITEMNAME =erpQcIssueResult.ItemName,
- ITEMNO =erpQcIssueResult.ItemNo,
+ ITEMNAME = erpQcIssueResult.ItemName,
+ ITEMNO = erpQcIssueResult.ItemNo,
SUPPLIERNAME = erpQcIssueResult.SupplierName,
- REMARK=erpQcIssueResult.Remark
+ REMARK = erpQcIssueResult.Remark
};
return mesQcIssueResults;
@@ -492,7 +550,7 @@
if (mapping.Any())
{
- if (qcIssueResults.QcStatu=="鎷掔粷")
+ if (qcIssueResults.QcStatu == "鎷掔粷")
{
string ReleaseNo = mapping.FirstOrDefault().ReleaseNo;
@@ -560,7 +618,8 @@
throw new Exception("鏈壘鍒伴渶瑕佹洿鏂扮殑璁板綍");
}
}
- else{
+ else
+ {
string ReleaseNo = mapping.FirstOrDefault().ReleaseNo;
// 鍙洿鏂� ReleaseNo 鍜� FReview 涓や釜瀛楁
@@ -662,8 +721,6 @@
}
}
-
-
}
// 鍝嶅簲妯″瀷
--
Gitblit v1.9.3