From 3974e154f280cd63d9c3153902e195cf52a2b826 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期六, 10 五月 2025 16:37:27 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
index ae118a1..251ea03 100644
--- a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
+++ b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -421,8 +421,6 @@
{
try
{
-
-
// 缁熶竴浣跨敤浜嬪姟db
//SaveOrUpdateApplicantData(db, ApplicantResults);
//SaveOrUpdateDepartmentData(db, DepartmentResults);
@@ -527,7 +525,8 @@
ITEMNAME = erpQcIssueResult.ItemName,
ITEMNO = erpQcIssueResult.ItemNo,
SUPPLIERNAME = erpQcIssueResult.SupplierName,
- REMARK = erpQcIssueResult.Remark
+ REMARK = erpQcIssueResult.Remark,
+ APPLICATIONRESON=erpQcIssueResult.Reason
};
return mesQcIssueResults;
@@ -569,7 +568,8 @@
ITEMNAME = qcIssueResults.ITEMNAME,
ITEMNO = qcIssueResults.ITEMNO,
SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
- REMARK = qcIssueResults.REMARK
+ REMARK = qcIssueResults.REMARK,
+ APPLICATIONRESON=qcIssueResults.APPLICATIONRESON
})
.Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
@@ -637,7 +637,9 @@
ITEMNAME = qcIssueResults.ITEMNAME,
ITEMNO = qcIssueResults.ITEMNO,
SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
- REMARK = qcIssueResults.REMARK
+ REMARK = qcIssueResults.REMARK,
+ APPLICATIONRESON = qcIssueResults.APPLICATIONRESON
+
})
.Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
--
Gitblit v1.9.3