From 5648a24be5fa8b8981c399c09a5d5a306bae1d5e Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 16 七月 2025 08:33:57 +0800
Subject: [PATCH] 工单备料测试
---
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
index ae118a1..b4848cc 100644
--- a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
+++ b/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);
@@ -421,8 +431,6 @@
{
try
{
-
-
// 缁熶竴浣跨敤浜嬪姟db
//SaveOrUpdateApplicantData(db, ApplicantResults);
//SaveOrUpdateDepartmentData(db, DepartmentResults);
@@ -438,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;
@@ -527,7 +536,9 @@
ITEMNAME = erpQcIssueResult.ItemName,
ITEMNO = erpQcIssueResult.ItemNo,
SUPPLIERNAME = erpQcIssueResult.SupplierName,
- REMARK = erpQcIssueResult.Remark
+ REMARK = erpQcIssueResult.Remark,
+ APPLICATIONRESON = erpQcIssueResult.Reason,
+ FLOW_CONDITION = GetFlowConditionValue(erpQcIssueResult.FReview) // 鏍规嵁璇勫鐘舵�佽缃祦绋嬫潯浠�
};
return mesQcIssueResults;
@@ -569,8 +580,9 @@
ITEMNAME = qcIssueResults.ITEMNAME,
ITEMNO = qcIssueResults.ITEMNO,
SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
- REMARK = qcIssueResults.REMARK
-
+ REMARK = qcIssueResults.REMARK,
+ APPLICATIONRESON = qcIssueResults.APPLICATIONRESON,
+ FLOW_CONDITION = qcIssueResults.FLOW_CONDITION
})
.Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
.ExecuteCommand();
@@ -637,8 +649,9 @@
ITEMNAME = qcIssueResults.ITEMNAME,
ITEMNO = qcIssueResults.ITEMNO,
SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
- REMARK = qcIssueResults.REMARK
-
+ REMARK = qcIssueResults.REMARK,
+ APPLICATIONRESON = qcIssueResults.APPLICATIONRESON,
+ FLOW_CONDITION = qcIssueResults.FLOW_CONDITION
})
.Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
.ExecuteCommand();
@@ -719,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"; // 榛樿鍊�
+ }
}
}
--
Gitblit v1.9.3