xwt
19 小时以前 aae5b9bafdf2145ab75817729f68fc3d86f9865f
钉钉接口新增流程条件,紧急放行
已修改4个文件
67 ■■■■ 文件已修改
StandardInterface/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/QcIssueResult/QcIssueResults.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs
@@ -48,4 +48,9 @@
    //申请部门
    public string? WorkShop { get; set; }
    //紧急放行
    public string? EMERGENCY { get; set; }
    //流程条件
    public string? FLOW_CONDITION { get; set; }
}
StandardInterface/MES.Service/Modes/QcIssueResult/QcIssueResults.cs
@@ -67,4 +67,12 @@
    [SugarColumn(ColumnName = "APPLICATIONRESON")]
    public string? APPLICATIONRESON { get; set; }
    //紧急放行
    [SugarColumn(ColumnName = "EMERGENCY")]
    public string? EMERGENCY { get; set; }
    //流程条件
    [SugarColumn(ColumnName = "FLOW_CONDITION")]
    public string? FLOW_CONDITION { get; set; }
}
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -328,6 +328,16 @@
                Name = "DDAttachment_23VB5MMC1R1C0",
                Value = "附件",
            };
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues17 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
            {
                Name = "TextField_X6NPRMTGFZ40",
                Value = getQcIssueResultDetail.EMERGENCY,
            };
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues18 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
            {
                Name = "NumberField_23LXMDXBXOTC0",
                Value = GetFlowConditionValue(getQcIssueResultDetail.IqcStatus),
            };
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners targetSelectActioners0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners
            {
                ActionerKey = "null",
@@ -354,7 +364,7 @@
                FormComponentValues = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues>
                {
                     formComponentValues1,formComponentValues2,formComponentValues3, formComponentValues4, formComponentValues5, formComponentValues6, formComponentValues7, formComponentValues8,
                     formComponentValues9, formComponentValues11
                     formComponentValues9, formComponentValues11, formComponentValues17, formComponentValues18
                },
                TargetSelectActioners = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners>
                {
@@ -404,9 +414,9 @@
    /**
     * 将带有流程号和检验单号的新记录插入表中
     */
    public dynamic SaveProcessNo(string ReleaseNo, string ProcessNo, string StaffNo, string Department)
    public dynamic SaveProcessNo(string ReleaseNo, string ProcessNo, string StaffNo, string Department, string IqcStatus = null)
    {
        var QcIssueResults = GetQcIssueResults(ReleaseNo, ProcessNo);
        var QcIssueResults = GetQcIssueResults(ReleaseNo, ProcessNo, IqcStatus);
        var ApplicantResults = GetApplicantResults(ProcessNo, StaffNo);
@@ -436,13 +446,14 @@
        });
    }
    public QcIssueResults GetQcIssueResults(string ReleaseNo, string ProcessNo)
    public QcIssueResults GetQcIssueResults(string ReleaseNo, string ProcessNo, string IqcStatus = null)
    {
        var QcIssueResults = new QcIssueResults
        {
            INSTANCEID = ProcessNo,
            ReleaseNo = ReleaseNo,
            QcStatu = ""
            QcStatu = "",
            FLOW_CONDITION = IqcStatus != null ? GetFlowConditionValue(IqcStatus) : null
        };
        return QcIssueResults;
@@ -526,7 +537,8 @@
            ITEMNO = erpQcIssueResult.ItemNo,
            SUPPLIERNAME = erpQcIssueResult.SupplierName,
            REMARK = erpQcIssueResult.Remark,
            APPLICATIONRESON=erpQcIssueResult.Reason
            APPLICATIONRESON = erpQcIssueResult.Reason,
            FLOW_CONDITION = GetFlowConditionValue(erpQcIssueResult.FReview) // 根据评审状态设置流程条件
        };
        return mesQcIssueResults;
@@ -569,8 +581,8 @@
                        ITEMNO = qcIssueResults.ITEMNO,
                        SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
                        REMARK = qcIssueResults.REMARK,
                        APPLICATIONRESON=qcIssueResults.APPLICATIONRESON
                        APPLICATIONRESON = qcIssueResults.APPLICATIONRESON,
                        FLOW_CONDITION = qcIssueResults.FLOW_CONDITION
                    })
                    .Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 显式指定更新条件
                    .ExecuteCommand();
@@ -638,9 +650,8 @@
                        ITEMNO = qcIssueResults.ITEMNO,
                        SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
                        REMARK = qcIssueResults.REMARK,
                        APPLICATIONRESON = qcIssueResults.APPLICATIONRESON
                        APPLICATIONRESON = qcIssueResults.APPLICATIONRESON,
                        FLOW_CONDITION = qcIssueResults.FLOW_CONDITION
                    })
                    .Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 显式指定更新条件
                    .ExecuteCommand();
@@ -721,7 +732,24 @@
            if (orUpdate) return true;
            throw new NotImplementedException("插入或更新失败");
        }
    }
    /**
     * 根据评审状态获取流程条件值
     */
    private string GetFlowConditionValue(string iqcStatus)
    {
        switch (iqcStatus)
        {
            case "退货":
                return "3";
            case "特采/让步使用":
                return "1";
            case "挑选/返工使用":
                return "2";
            default:
                return "0"; // 默认值
        }
    }
}
StandardInterface/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
@@ -35,7 +35,7 @@
    [HttpPost("GetProcessNo")]
    public IActionResult StartDingtalkProcess([FromBody] GetQcIssueResultDetail getQcIssueResultDetail)
    {
        try
        {
            // 新增URL解码处理逻辑
@@ -54,7 +54,7 @@
            dynamic resultInfos = new ExpandoObject();
            string ProcessNo = instanceId;
            var save = m.SaveProcessNo(getQcIssueResultDetail.ReleaseNo, instanceId,getQcIssueResultDetail.StaffNo,getQcIssueResultDetail.Department);
            var save = m.SaveProcessNo(getQcIssueResultDetail.ReleaseNo, instanceId, getQcIssueResultDetail.StaffNo, getQcIssueResultDetail.Department, getQcIssueResultDetail.IqcStatus);
            resultInfos.tbBillList = save;
            return Ok(result);