From 4c2d9a4dbef1e5dae234b78ec980e521bf89fb0d Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期六, 08 十一月 2025 19:24:58 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~sjz/YC
---
MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs | 29 +++++++++++++++++++++++++++--
MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 9 ++++++---
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
index 8e3d338..fc3d924 100644
--- a/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
+++ b/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -19,6 +19,7 @@
using Newtonsoft.Json;
using Oracle.ManagedDataAccess.Client;
using System.Data;
+using SixLabors.ImageSharp.Drawing;
namespace MES.Service.service.QcIssueResult;
@@ -300,11 +301,13 @@
string requestContent = Newtonsoft.Json.JsonConvert.SerializeObject(startProcessInstanceRequest);
Debug.WriteLine("startProcessInstanceRequest鍐呭锛�");
Debug.WriteLine(startProcessInstanceRequest);
- return $"TeaException: Code={err.Code}, Message={err.Message}";
+ var str = $"TeaException: Code={err.Code}, Message={err.Message}";
+ throw new Exception(str);
}
catch (Exception _err)
{
- return $"Exception: {_err.Message}";
+ //return $"Exception: {_err.Message}";
+ throw new Exception(_err.Message);
}
}
else {
@@ -316,7 +319,7 @@
/**
* 灏嗗甫鏈夋祦绋嬪彿鍜屾楠屽崟鍙风殑鏂拌褰曟彃鍏ヨ〃涓�
*/
- public dynamic SaveProcessNo(string ReleaseNo,string ProcessNo)
+ public bool SaveProcessNo(string ReleaseNo,string ProcessNo)
{
var QcIssueResults = GetQcIssueResults(ReleaseNo, ProcessNo);
diff --git a/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs b/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
index 53c0dd1..2895da9 100644
--- a/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
+++ b/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.Dto.webApi;
+锘縰sing AngleSharp.Dom;
+using MES.Service.Dto.webApi;
using MES.Service.Dto.webApi.QcIssueResult;
using MES.Service.Modes;
using MES.Service.Modes.QcIssueResult;
@@ -35,7 +36,15 @@
[HttpPost("GetProcessNo")]
public IActionResult StartDingtalkProcess([FromBody] GetQcIssueResultDetail getQcIssueResultDetail)
{
-
+
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(getQcIssueResultDetail);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+
try
{
// 鏂板URL瑙ｇ爜澶勭悊閫昏緫
@@ -57,11 +66,27 @@
var save = m.SaveProcessNo(getQcIssueResultDetail.ReleaseNo, instanceId);
resultInfos.tbBillList = save;
+ if (save) entity.Result = 1;
+ entity.DealWith = 1;
+
+ _manager.save(entity);
+
return Ok(result);
}
catch (Exception ex)
{
// 鎹曡幏寮傚父骞惰繑鍥為敊璇俊鎭�
+
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ //return ResponseResult.ResponseError(ex);
+
return StatusCode(500, $"鍚姩閽夐拤宸ヤ綔娴佸疄渚嬪け璐�: {ex.Message}");
}
}
--
Gitblit v1.9.3