From 823e5cae379ee1a259f79060ca0015d381c61f79 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期六, 16 八月 2025 08:32:11 +0800
Subject: [PATCH] 入库检，来料检显示权限
---
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
index beec420..a6dff30 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);
@@ -421,8 +435,6 @@
{
try
{
-
-
// 缁熶竴浣跨敤浜嬪姟db
//SaveOrUpdateApplicantData(db, ApplicantResults);
//SaveOrUpdateDepartmentData(db, DepartmentResults);
@@ -438,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;
@@ -528,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;
@@ -571,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();
@@ -640,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();
@@ -723,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