From 10a392d09c021caf0ca1fca21b424736862f4e48 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 04 九月 2023 13:17:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/QC_ManagementController.cs | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index a3743c1..f34840d 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -1223,6 +1223,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string user = sArray[2].ToString();
+ string badmsg = sArray[3].ToString();
string UserName = "";
@@ -1301,10 +1302,34 @@
oItemSub.HRelationQty = 0;
oItemSub.HRelationMoney = 0;
oItemSub.HCloseMan = "";
- oItemSub.HRemark = "";
+ //oItemSub.HRemark = "";
oBill.DetailColl.Add(oItemSub);
}
+ badmsg = badmsg.Substring(1, badmsg.Length - 2);
+ badmsg = badmsg.Replace("\\", "");
+ badmsg = badmsg.Replace("\n", ""); //\n
+ List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> bs = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
+ bs = oListModels.getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(badmsg);
+ int j = 0;
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason badSub in bs)
+ {
+ badSub.HBillNo_bak = oBill.omodel.HBillNo;//鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ j++;
+ if (string.IsNullOrWhiteSpace(badSub.HBillNo_bak))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病澶囦唤鍗曟嵁鍙凤紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ badSub.HInterID = oBill.omodel.HInterID;
+ badSub.HEntryID = j;
+ badSub.HSEQ = j;
+ oBill.DetailColl_Bad.Add(badSub);
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
--
Gitblit v1.9.1