cnf
2025-05-08 bad4badaa36382cd3ff2e7fd766a26dadd26645b
推送异常处置单逻辑完成
已修改4个文件
111 ■■■■ 文件已修改
StandardInterface/MES.Service/Modes/LtsLlj.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/QcIssueResult/IqcDepartment.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs 95 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/LtsLlj.cs
@@ -147,6 +147,18 @@
    public string? SuppName { get; set; }
    /// <summary>
    ///     组织编码
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENTID")]
    public string? DEPARTMENTID { get; set; }
    /// <summary>
    ///     组织名称
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENTNAME")]
    public string? DEPARTMENTNAME { get; set; }
    /// <summary>
    ///     物料规格
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_MODEL")]
StandardInterface/MES.Service/Modes/QcIssueResult/IqcDepartment.cs
@@ -7,6 +7,8 @@
namespace MES.Service.Modes.QcIssueResult;
//异常处置单结果表
[SugarTable("MES_QCISSUE_RESULT_DEPARTMENT")]
public class IqcDepartment
{
    //SEQ_QCISSUE_RESULT_DEPARTMENT
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 初始化账号Client
@@ -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 @@
        }
    }
}
// 响应模型
StandardInterface/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
@@ -54,7 +54,7 @@
            dynamic resultInfos = new ExpandoObject();
            string ProcessNo = instanceId;
            var save = m.SaveProcessNo(getQcIssueResultDetail.ReleaseNo, instanceId);
            var save = m.SaveProcessNo(getQcIssueResultDetail.ReleaseNo, instanceId,getQcIssueResultDetail.StaffNo,getQcIssueResultDetail.Department);
            resultInfos.tbBillList = save;
            return Ok(result);