From c193ef49cf93c007b8b908574e92ba5d8b0f6fc3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 06 三月 2024 08:37:37 +0800
Subject: [PATCH] PDA,设备 质量模块扫码
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index fceb653..702f2bb 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -1099,6 +1099,9 @@
bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
long HProcExchInterID = list[0].HProcExchInterID;//娴佽浆鍗D
long HProcExchEntryID = list[0].HProcExchEntryID;//娴佽浆鍗″瓙ID
+ long HMainSourceInterID = list[0].HMainSourceInterID;//婧愬崟ID
+ long HMainSourceEntryID = list[0].HMainSourceEntryID;//婧愬崟瀛怚D
+ string HMainSourceBillNo = list[0].HMainSourceBillNo;//娴佽浆鍗″瓙ID
//琛ㄤ綋鏁版嵁
List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg_entry);
@@ -1155,7 +1158,7 @@
}
//鍗曟嵁瀹屾暣鎬у垽鏂�
- if (HProcExchBillNo == "")
+ if (HProcExchBillNo == "" && HMainSourceBillNo.Substring(0, Math.Min(2, HMainSourceBillNo.Length)) != "MO" )
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1184,10 +1187,10 @@
oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
- ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID)" +
+ ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)" +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
- "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + ") ");
+ "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "'" + ") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in BillNew.DetailColl)
--
Gitblit v1.9.1