From 4598e856759f043f203d45a0674626b9e2ff89b8 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期四, 18 九月 2025 10:29:29 +0800
Subject: [PATCH] 组装拆卸
---
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
index 251ea03..9648fdf 100644
--- a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
+++ b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -213,7 +213,7 @@
* @return string 杩斿洖鍚姩缁撴灉
*/
- public string GetProcessNo(GetQcIssueResultDetail getQcIssueResultDetail)
+ public string GetProcessNo(GetQcIssueResultDetail getQcIssueResultDetail, string processType = "LLJ")
{
var db = SqlSugarHelper.GetInstance();
@@ -247,6 +247,10 @@
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders startProcessInstanceHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders();
Debug.WriteLine(accessToken);
startProcessInstanceHeaders.XAcsDingtalkAccessToken = accessToken; // 浣跨敤鑾峰彇鍒扮殑 Access Token
+
+ // 鏍规嵁娴佺▼绫诲瀷閫夋嫨涓嶅悓鐨凱rocessCode
+ string processCode = "PROC-4F4B3976-BA15-47EF-9A3C-3A07AC07DFEA"; // 缁熶竴浣跨敤鏉ユ枡妫�娴佺▼缂栫爜
+
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues1 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "TextField_K5AVR59BD28",
@@ -328,6 +332,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",
@@ -349,12 +363,12 @@
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest startProcessInstanceRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest
{
OriginatorUserId = UserId,
- ProcessCode = "PROC-4F4B3976-BA15-47EF-9A3C-3A07AC07DFEA",
+ ProcessCode = processCode,
DeptId = 1,
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 +418,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 +450,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 +541,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 +585,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 +654,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();
@@ -684,7 +699,7 @@
var outParam1 = new SugarParameter("PO_RESULT", null, true);
var outParam2 = new SugarParameter("PO_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_MES_IQC_CG_SUBMIT(:PI_BILLNO,:PI_BILLNO,:PI_HANDLE,:PI_TLFS,:PI_REMARK,:PO_RESULT,:PO_MSG); END;", inputParam1, inputParam2, inputParam3, inputParam4, inputParam5, outParam1, outParam2);
+ Db.Ado.ExecuteCommand("BEGIN PRC_MES_IQC_CG_SUBMIT(:PI_BILLNO,:PI_USER ,:PI_HANDLE,:PI_TLFS,:PI_REMARK,:PO_RESULT,:PO_MSG); END;", inputParam1, inputParam2, inputParam3, inputParam4, inputParam5, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
int result = int.Parse((string)outParam1.Value);
string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
@@ -721,7 +736,21 @@
if (orUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
+ }
+ /**
+ * 鏍规嵁璇勫鐘舵�佽幏鍙栨祦绋嬫潯浠跺��
+ */
+ private string GetFlowConditionValue(string iqcStatus)
+ {
+ switch (iqcStatus)
+ {
+
+ case "寰呭垽":
+ return "1";
+ default:
+ return "0"; // 榛樿鍊�
+ }
}
}
--
Gitblit v1.9.3