Merge branch 'master' of http://43.142.96.171:8080/r/~sjz/YC

zyf

2025-11-08 4c2d9a4dbef1e5dae234b78ec980e521bf89fb0d

Merge branch 'master' of http://43.142.96.171:8080/r/~sjz/YC

 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);

 MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs

@@ -1,4 +1,5 @@
using MES.Service.Dto.webApi;
using 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}");
        }
    }