From a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
index ea72ee8..212630d 100644
--- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -262,6 +262,15 @@
string OperationType = sArray[2].ToString();
string user = sArray[3].ToString();
string Value = sArray[4].ToString();
+ string BadReason = null;
+ if(sArray.Length > 4)
+ {
+ BadReason = sArray[5].ToString();
+ }
+ if (String.IsNullOrWhiteSpace(BadReason) == true)
+ {
+ BadReason = "[]";
+ }
bool bResult;
try
{
@@ -325,8 +334,11 @@
BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
-
+ BillNew.omodel.HRemarkSN = ClsPub.isStrNull(mainList[0].HRemarkSN);
+ BillNew.omodel.HCheckQty = mainList[0].HCheckQty;
List<Model.ClsQC_OutCompCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_OutCompCheckBillSub>>(msg3);
+ List<Model.ClsQC_POStockInCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub_BadReason>>(BadReason);
+
BillNew.DetailColl = new List<Model.ClsQC_OutCompCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -378,6 +390,7 @@
oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);//妫�楠屾柟娉�
oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);//妫�楠屼緷鎹�
oSub.HCompareSymbol = DBUtility.ClsPub.isStrNull(subList[i].HCompareSymbol);//姣旇緝绗�
+ oSub.HInspectValQ = subList[i].HInspectValQ;
BillNew.DetailColl.Add(oSub);
}
@@ -391,6 +404,25 @@
}
}
+ for (int i = 0; i < badReasonList.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsQC_OutCompCheckBillSub_BadReason oSub = new Model.ClsQC_OutCompCheckBillSub_BadReason();
+ oSub.HInterID = mainList[0].HInterID;
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(badReasonList[i].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(badReasonList[i].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(badReasonList[i].HCloseType);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ oSub.HQty = badReasonList[i].HQty;
+ oSub.HBadReasonID = badReasonList[i].HBadReasonID;
+
+ BillNew.DetailCol1_BadReason.Add(oSub);
+ }
+ }
+
--
Gitblit v1.9.1