From d0191bf7ec69d670597a577d5f60857997bface3 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期二, 27 一月 2026 14:48:11 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/品质管理/工序检验单/MES_ProcessCheckBill_PDAController.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
index 8422d60..7d878ff 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
@@ -66,8 +66,10 @@
long HProcID = list[0].HProcID;//宸ュ簭ID
long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+ long HQCSchemeID = list[0].HQCSchemeID;//妫�楠屾柟妗�
Int64 HProcExchInterID = list[0].HProcExchInterID;//鎸囧紩鍗D
Int64 HProcExchEntryID = list[0].HProcExchEntryID;//鎸囧紩鍗″瓙ID
+ string HBatchNo = list[0].HBatchNo;//娴佽浆鍗℃壒娆″彿
long HMainSourceInterID = list[0].HMainSourceInterID;//婧愬崟ID
long HMainSourceEntryID = list[0].HMainSourceEntryID;//婧愬崟瀛怚D
string HMainSourceBillNo = list[0].HMainSourceBillNo;//婧愬崟鍗曞彿
@@ -114,7 +116,12 @@
oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
- oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "true" ? 1 : 0);
+ oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0);
+
+ oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);//妫�楠岃褰�
+ oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
+ oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
+ oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
BillNew.DetailColl.Add(oSub);
}
@@ -158,11 +165,12 @@
oCN.RunProc("Insert Into QC_ProcessCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
- ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HProcID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
+ ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HProcID,HQCSchemeID,HBatchNo," +
+ "HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
- "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HProcID + "," + HMainSourceInterID +
- "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
+ "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcID + "','" + HQCSchemeID + "','" + HBatchNo + "'" +
+ "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_ProcessCheckBillSub oSub in BillNew.DetailColl)
@@ -173,12 +181,14 @@
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" +
",HProcCheckEmp,HProcCheckTime,HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ",HQCNote,HMax,HMin,HAvg" +
") values("
+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
"," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "','" + oSub.HResult + "'" +
"," + oSub.HProcCheckEmp.ToString() + ",GETDATE()" + ",'" + oSub.HStatus +
- "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ", '" + oSub.HQCNote + "', '" + oSub.HMax + "', '" + oSub.HMin + "', '" + oSub.HAvg + "'" +
") ");
}
}
--
Gitblit v1.9.1