From 1ae6d87bb3fde2c10b4da671705ddc8977bc30b9 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 23 十二月 2025 09:37:16 +0800
Subject: [PATCH] 1
---
DAL/质检管理/ClsQC_POStockInCheckBill.cs | 13
DAL/质检管理/ClsQC_OutCompCheckBill.cs | 13
DAL/bin/Release/Model.dll | 0
DAL/bin/Release/DAL.pdb | 0
DAL/质检管理/ClsQC_LastPieceCheckBill.cs | 14
WebAPI/Controllers/QC_POStockInCheckBillController.cs | 16 +
WebAPI/Web References/WebS/Reference.cs | 233 +++++++++++++++++++++++
WebAPI/Web.config | 2
DAL/bin/Release/DAL.dll | 0
Model/质检管理/ClsQC_OutCompCheckBillSub.cs | 2
DAL/bin/Release/Model.pdb | 0
Model/obj/Release/Model.dll | 0
Model/质检管理/ClsQC_POStockInCheckBillMain.cs | 2
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 4
Model/obj/Release/Model.pdb | 0
Model/bin/Release/Model.pdb | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 247 ++++++++++++++++++++++++
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
Model/质检管理/ClsQC_LastPieceCheckBillMain.cs | 2
Model/bin/Release/Model.dll | 0
Model/质检管理/ClsQC_POStockInCheckBillSub.cs | 1
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 3
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs | 17 +
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user | 20 +-
Model/质检管理/ClsQC_LastPieceCheckBillSub.cs | 2
25 files changed, 556 insertions(+), 35 deletions(-)
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 450bfaa..be32562 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 884102a..6c7fe6f 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index f1d1a00..00c8d10 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index 167254d..ac636ca 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs"
index 120b28d..4164bc7 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs"
@@ -81,6 +81,8 @@
",HShiftsID=" + omodel.HShiftsID.ToString() +
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
+ ",HRemarkSN='" + omodel.HRemarkSN + "'" +
+ ",HCheckQty=" + omodel.HCheckQty +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -95,14 +97,14 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
- ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID" +
+ ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID, HInsepctValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HUnit + "','" + oSub.HQCNote + "','" + oSub.HResult + "'" +
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','" + oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID + "'" +
- ") ");
+ ","+ oSub.HInspectValQ + ") ");
}
//foreach (Model.ClsQC_LastPieceCheckBillSub_Item oSub2 in DetailColl1)
//{
@@ -160,14 +162,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HRemarkSN, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
- "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
+ "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','"+omodel.HRemarkSN + "'," + omodel.HCheckQty +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_LastPieceCheckBillSub oSub in DetailColl)
@@ -179,7 +181,7 @@
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
- ",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -188,7 +190,7 @@
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
- "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
+ "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'," + oSub.HInspectValQ +") ");
}
//foreach (Model.ClsQC_LastPieceCheckBillSub_Item oSub2 in DetailColl1)
//{
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs"
index 4cd17c7..1dc2c92 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs"
@@ -84,6 +84,7 @@
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HRemarkSN='" + omodel.HRemarkSN + "'" +
+ ",HCheckQty=" + omodel.HCheckQty +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -99,13 +100,13 @@
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol" +
- ") values("
+ ", HInsepctValQ) values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HUnit + "','" + oSub.HQCNote + "','" + oSub.HResult + "'" +
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','" + oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID +
- "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
+ "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" + oSub.HInspectValQ +
") ");
}
//foreach (Model.ClsQC_OutCompCheckBillSub_Item oSub2 in DetailColl1)
@@ -195,14 +196,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
- "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'" +
+ "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'," + omodel.HCheckQty +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_OutCompCheckBillSub oSub in DetailColl)
@@ -215,7 +216,7 @@
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol" +
- ") values("
+ ", HInspectValQ) values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
@@ -224,7 +225,7 @@
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult+
- "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
+ "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'," + oSub.HInspectValQ +
") ");
}
//foreach (Model.ClsQC_OutCompCheckBillSub_Item oSub2 in DetailColl1)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs"
index ba7c8b0..f29be24 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs"
@@ -84,6 +84,7 @@
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HRemarkSN='" + omodel.HRemarkSN + "'" +
+ ",HCheckQty=" + omodel.HCheckQty +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -102,7 +103,7 @@
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID" +
+ ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID, HInsepctValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -112,7 +113,7 @@
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
- $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}" +
+ $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}, {oSub.HInspectValQ}" +
") ");
}
//foreach (Model.ClsQC_POStockInCheckBillSub_Item oSub2 in DetailColl1)
@@ -170,7 +171,7 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HRemarkSN" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HRemarkSN, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
@@ -178,7 +179,7 @@
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
"," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
- ",'" + omodel.HRemarkSN+ "') ");
+ ",'" + omodel.HRemarkSN+ "',"+ omodel.HCheckQty +") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_POStockInCheckBillSub oSub in DetailColl)
{
@@ -190,7 +191,7 @@
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID" +
+ ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -200,7 +201,7 @@
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
- $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}"+
+ $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}, {oSub.HInspectValQ}" +
") ");
}
//foreach (Model.ClsQC_POStockInCheckBillSub_Item oSub2 in DetailColl1)
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index c47c5d6..f5e894a 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index f1d1a00..00c8d10 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index 167254d..ac636ca 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index f1d1a00..00c8d10 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index 167254d..ac636ca 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs"
index 331c087..1ccb077 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs"
@@ -49,5 +49,7 @@
public string HBatchNo;
public string HTakeSampleCheckBillNo;
+
+ public string HRemarkSN;
}
}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs"
index b2272d3..592b997 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs"
@@ -39,6 +39,8 @@
public Int64 HKeyInspect;
public Int64 HInspectInstruMentID;
public String HInspectResult;
+
+ public decimal HInspectValQ;
//public HSamplingType;
//public HInspectionLevel;
//public HStrictness;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs"
index 98c31e6..1650eaa 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs"
@@ -41,6 +41,8 @@
public Int64 HInspectMethodID;//检验方法
public Int64 HInspectBasisID;//检验标准
public String HCompareSymbol;//比较符
+
+ public decimal HInspectValQ;
//public HSamplingType;
//public HInspectionLevel;
//public HStrictness;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs"
index f95f75a..6b8d821 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs"
@@ -10,7 +10,7 @@
public Int64 HSupID;
public Int64 HMaterID;
public Int64 HInStockQty;
- public Int64 HCheckQty;
+ public decimal HCheckQty;
public Int64 HRightQty;
public Int64 HBadQty;
public Int64 HFirstCheckEmp;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
index 142d999..e2f61f4 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
@@ -47,6 +47,7 @@
public Int64 HQualityStdID; // 质量标准
public Int64 HInspectMethodID; // 检验方法
public Int64 HInspectBasisID; // 检验依据
+ public decimal HInspectValQ; // 检验值(定量分析)
}
}
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 74cbdee..8c0dd1e 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -758,6 +758,7 @@
var _value = sMainSub["sMainSub"].ToString();
string msg1 = _value.ToString();
oCN.BeginTran();
+
//淇濆瓨涓昏〃
objJsonResult = AddBillMain(msg1);
if (objJsonResult.code == "0")
@@ -770,6 +771,16 @@
return objJsonResult;
}
oCN.Commit();
+ #region 鐢熸垚閲戣澏鍗曟嵁锛堝厛淇濆瓨鍒癿es鏈湴锛岄�氳繃鏈湴璋冪敤鐢熸垚閲戣澏鍗曟嵁锛�
+ if (!jindieCloud(msg1))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
@@ -787,7 +798,238 @@
return objJsonResult;
}
}
+ public bool jindieCloud(string msg1)
+ {
+ WebS.ClsCg_POOrderBillMain websLsmain = new WebS.ClsCg_POOrderBillMain();
+ //WebS.ClsCg_POInStockBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+ string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
+ websLsmain.HInterID = mainList[0].HInterID;
+ websLsmain.HDate = mainList[0].HDate;
+ websLsmain.HBillNo = mainList[0].HBillNo;
+ websLsmain.HSupID = mainList[0].HSupID;
+ websLsmain.HEmpID = mainList[0].HEmpID;
+ websLsmain.HSTOCKORGID = mainList[0].HUSEORGID;
+ websLsmain.HBillType = mainList[0].HBillType;
+ if (!oWebs.set_Bill_New(websLsmain, "1100", ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return false;
+ }
+ objJsonResult = AddBillMould(msg1);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return false;
+ }
+ return true;
+ }
+ public json AddBillMould(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
+ List<Gy_Mould> mainList1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg3);
+ string BillType = "3899";
+ //寰楀埌mainid
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
+ double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ string HMouldNo = HInterID+"xxx";
+ string HBarCode = HBillNo+"xxx";
+ string HName = mainList[0].HName??"娴嬭瘯妯″叿";
+ string HModel = mainList[0].HModel?? "娴嬭瘯";
+ string HModel2 = mainList[0].HModel2 ?? "娴嬭瘯";
+ string HDiameter = mainList[0].HDiameter ?? "娴嬭瘯";
+ string HSubjoin = mainList[0].HSubjoin ?? "娴嬭瘯";
+ string HSubjoin2 = mainList[0].HSubjoin2 ?? "娴嬭瘯";
+ string HPICNo = mainList[0].HPICNo ?? "娴嬭瘯";
+ string HWorkMaterModel = mainList[0].HWorkMaterModel ?? "娴嬭瘯";
+ long HMaterID = mainList1[0].HMaterID;
+ long HMouleTypeID = 1;
+ long HUnitID = mainList1[0].HUnitID;
+ DateTime HOutComDate = DateTime.Now;
+ string HOutComNo = mainList[0].HOutComNo ?? "娴嬭瘯";
+ long HDeptID = 0;
+ long HSupID = mainList[0].HSupID;
+ string HMouldStatus = "0";
+ long HWHID = 0;
+ long HRoutingID = 0;
+ long HBOMID = 0;
+ string HVersion = "娴嬭瘯";
+ long HSPGroupID = 0;
+ long HSPID = 0;
+ Double HDesignLife = 0;
+ Double HUseLife = 0;
+ Double HInitLife = 0;//涓婄嚎鍒濆鍖栧鍛�
+ Double HLeaveLife =0;
+ Double HProdQty = 0;
+ Double HProdWeight = 0;
+ string HRemark = "娴嬭瘯";
+ string HMaker = "admin";
+ string HMaterNumber = "admin";
+ string HSupNumber = "test";
+ long HPrintQty =1;
+ string HMouldOWNER = "test";
+ string HSaveLife = "0";
+ int HCaveQty = 0;
+ int HMouldDotCheckRuleInterID =0;
+ int HMouldMaintainRuleInterID = 0;
+ int HNowSupID = 0;
+ int HNowSupTypeID = 0;
+ int HMadeSupID =0;
+ string HMouldClass = "test";
+ int HNowWHID = 0;
+ int HNowSPID = 0;
+ string HMouldUseStatus = "test";
+ int HCREATEORGID = mainList[0].HCREATEORGID;
+ int HUSEORGID = mainList[0].HUSEORGID;
+ bool HTransPackFlag = false; //鍛ㄨ浆瀹瑰櫒鏍囪
+ bool HSendPackFlag = false; //鍙戣揣瀹瑰櫒鏍囪
+ int HMouldLength =0; //闀�
+ int HMouldWidth = 0; //瀹�
+ int HMouldHeight = 0; //楂�
+ int HMouldFoldHeight =0; //鎶樺彔楂樺害
+ int HUserID = 0; // 浣跨敤浜猴紙Gy_Employee锛�
+ string HBrand = "娴嬭瘯"; // 鍝佺墝
+ string HCalibrationType = "娴嬭瘯"; // 鏍″噯绫诲瀷 (鍐�/澶栨牎)
+ string HLocation = "娴嬭瘯"; // 浣嶇疆
+ DateTime HCalibrationDate =DateTime.Now; // 鏍″噯鏃ユ湡
+ string HCalibrationCycle = "娴嬭瘯"; // 鏍″噯鍛ㄦ湡
+ string HProductDesignSize = "娴嬭瘯"; // 浜у搧璁捐灏哄
+ string HGaugeDesignSize = "娴嬭瘯"; // 妫�鍏疯璁″昂瀵�
+ int HProductQTY = 1; // 浜у搧鏁伴噺
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_BeforeSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_MouldFileMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMouldNo,HName,HModel,HModel2,HDiameter" +
+ ",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
+ ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
+ ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
+ ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
+ ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
+ ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
+ ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
+ ",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag," +
+ "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY ) " +
+
+ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
+ ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
+ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
+ ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
+ "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
+ ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
+ "," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + "," +
+ "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "') ");
+
+ //瀛愯〃
+ oCN.RunProc("Insert into Gy_MouldFileSub " +
+ " (HInterID,HEntryID,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") " +
+ " values('" + HInterID + "',0,''" +
+ ",0,0,'','',0,0 " +
+ ") ");
+
+ //objJsonResult = AddBillSub(msg5, msg6, msg7, HInterID, HBillNo);
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_AfterSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //=========================================================
+
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.HInterID = HInterID.ToString();
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
public json AddBillMain(string msg1)
{
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -796,12 +1038,11 @@
int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
string user = sArray[3].ToString();
string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
-
+
try
{
msg2 = "[" + msg2.ToString() + "]";
List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
-
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
@@ -1225,6 +1466,8 @@
}
#endregion
+ public WebS.WebService1 oWebs = new WebS.WebService1();
+
/// <summary>
///鍒犻櫎鍔熻兘
/// </summary>
diff --git a/WebAPI/Controllers/QC_POStockInCheckBillController.cs b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
index b10e2d8..1405bdb 100644
--- a/WebAPI/Controllers/QC_POStockInCheckBillController.cs
+++ b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
@@ -1012,6 +1012,18 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ // 鍒ゆ柇鍗曟嵁鏄惁閲嶅
+ DataSet ds2 = oCN.RunProcReturn("select top 1 HInterID from QC_POStockInCheckBillMain where HInterID=" + mainList[0].HInterID, "QC_POStockInCheckBillMain");
+ if(ds2.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒鍗曟嵁閲嶅鎻愪氦!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
//鍥哄畾璧嬪��=================================
@@ -1045,9 +1057,11 @@
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_POStockInCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub>>(msg3);
List<Model.ClsQC_POStockInCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub_BadReason>>(BadReason);
BillNew.DetailColl = new List<Model.ClsQC_POStockInCheckBillSub>();
+
for (int i = 0; i < subList.ToArray().Length; i++)
{
@@ -1097,6 +1111,8 @@
oSub.HQualityStdID = DBUtility.ClsPub.isLong(subList[i].HQualityStdID);
oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);
oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);
+ oSub.HInspectValQ = subList[i].HInspectValQ;
+
BillNew.DetailColl.Add(oSub);
}
else
diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
index 7233fcd..16c41e9 100644
--- a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
@@ -788,6 +788,19 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ // 鍒ゆ柇鍗曟嵁鏄惁閲嶅
+ DataSet ds2 = oCN.RunProcReturn("select top 1 HInterID from QC_LastPieceCheckBillMain where HInterID=" + mainList[0].HInterID, "QC_LastPieceCheckBillMain");
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒鍗曟嵁閲嶅鎻愪氦!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
//鍥哄畾璧嬪��=================================
@@ -820,6 +833,8 @@
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_LastPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub>>(msg3);
List<Model.ClsQC_LastPieceCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub_BadReason>>(BadReason);
@@ -870,6 +885,8 @@
oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+ oSub.HInspectValQ = subList[i].HInspectValQ;
+
BillNew.DetailColl.Add(oSub);
}
else
diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
index 6f73800..212630d 100644
--- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -334,7 +334,8 @@
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);
@@ -389,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);
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
index 807d8a8..2b9267f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-12-19T07:51:36.9735361Z;True|2025-12-19T15:25:54.2767592+08:00;True|2025-12-19T14:41:07.3130752+08:00;True|2025-12-19T14:37:24.0368827+08:00;True|2025-12-19T14:33:43.2528937+08:00;True|2025-12-19T14:22:42.8786085+08:00;False|2025-12-19T14:21:47.3281347+08:00;True|2025-12-18T17:00:25.3978317+08:00;False|2025-12-18T16:59:08.8776140+08:00;True|2025-12-17T15:05:20.4972081+08:00;True|2025-12-17T14:56:40.4723575+08:00;True|2025-12-17T14:42:54.7527692+08:00;True|2025-12-17T14:14:57.6558359+08:00;True|2025-12-17T13:46:50.8083801+08:00;True|2025-12-17T09:27:07.4023648+08:00;False|2025-12-17T09:25:56.6443842+08:00;True|2025-12-16T16:18:59.7366636+08:00;False|2025-12-16T16:18:08.0149952+08:00;True|2025-12-16T10:46:52.7815645+08:00;True|2025-12-16T10:32:25.9340809+08:00;True|2025-12-16T10:23:58.5183174+08:00;False|2025-12-16T10:23:06.1859498+08:00;True|2025-12-15T08:06:12.6833489+08:00;False|2025-12-15T08:05:23.3449223+08:00;True|2025-12-14T21:32:50.6557670+08:00;True|2025-08-13T13:32:18.1126471+08:00;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
+ <History>True|2025-12-22T08:02:06.5410343Z;True|2025-12-22T15:43:45.9660702+08:00;True|2025-12-22T15:28:36.1194727+08:00;True|2025-12-22T15:15:46.1540932+08:00;True|2025-12-22T15:14:03.4401553+08:00;True|2025-12-22T13:39:55.5754991+08:00;True|2025-12-22T13:32:39.0919790+08:00;False|2025-12-22T13:31:43.7527463+08:00;True|2025-12-19T15:51:36.9735361+08:00;True|2025-12-19T15:25:54.2767592+08:00;True|2025-12-19T14:41:07.3130752+08:00;True|2025-12-19T14:37:24.0368827+08:00;True|2025-12-19T14:33:43.2528937+08:00;True|2025-12-19T14:22:42.8786085+08:00;False|2025-12-19T14:21:47.3281347+08:00;True|2025-12-18T17:00:25.3978317+08:00;False|2025-12-18T16:59:08.8776140+08:00;True|2025-12-17T15:05:20.4972081+08:00;True|2025-12-17T14:56:40.4723575+08:00;True|2025-12-17T14:42:54.7527692+08:00;True|2025-12-17T14:14:57.6558359+08:00;True|2025-12-17T13:46:50.8083801+08:00;True|2025-12-17T09:27:07.4023648+08:00;False|2025-12-17T09:25:56.6443842+08:00;True|2025-12-16T16:18:59.7366636+08:00;False|2025-12-16T16:18:08.0149952+08:00;True|2025-12-16T10:46:52.7815645+08:00;True|2025-12-16T10:32:25.9340809+08:00;True|2025-12-16T10:23:58.5183174+08:00;False|2025-12-16T10:23:06.1859498+08:00;True|2025-12-15T08:06:12.6833489+08:00;False|2025-12-15T08:05:23.3449223+08:00;True|2025-12-14T21:32:50.6557670+08:00;True|2025-08-13T13:32:18.1126471+08:00;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,19 +45,19 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/19/2025 15:51:11</publishTime>
+ <publishTime>12/22/2025 16:01:41</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/19/2025 15:51:11</publishTime>
+ <publishTime>12/22/2025 16:01:41</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/19/2025 15:51:08</publishTime>
+ <publishTime>12/22/2025 16:01:39</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/19/2025 15:51:08</publishTime>
+ <publishTime>12/22/2025 16:01:39</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/19/2025 15:51:02</publishTime>
+ <publishTime>12/22/2025 16:01:33</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/19/2025 15:51:02</publishTime>
+ <publishTime>12/22/2025 16:01:33</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -294,13 +294,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/19/2025 15:51:21</publishTime>
+ <publishTime>12/22/2025 16:01:51</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/19/2025 15:51:21</publishTime>
+ <publishTime>12/22/2025 16:01:51</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/19/2025 15:51:35</publishTime>
+ <publishTime>12/22/2025 16:02:04</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 9038b11..e823f1d 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -14812,7 +14812,17 @@
sErrMsg = ((string)(results[1]));
return ((bool)(results[0]));
}
-
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_Bill_New", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_Bill_New(ClsCg_POOrderBillMain oMain, string sHSourceType, ref string sErrMsg)
+ {
+ object[] results = this.Invoke("set_Bill_New", new object[] {
+ oMain,
+ sHSourceType,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
/// <remarks/>
public void set_SaveOtherOutBill_NewAsync(ClsKf_OtherOutBillMain oMain, string sHSourceType, string sErrMsg) {
this.set_SaveOtherOutBill_NewAsync(oMain, sHSourceType, sErrMsg, null);
@@ -41535,7 +41545,226 @@
}
}
}
-
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://tempuri.org/")]
+ public partial class ClsCg_POOrderBillMain : ClsXt_BaseBillMain
+ {
+
+
+ private long hSupIDField;
+
+ private long hWHIDField;
+
+ private long hSCWHIDField;
+
+ private long hEmpIDField;
+
+ private long hManagerIDField;
+
+ private long hSecManagerIDField;
+
+ private long hKeeperIDField;
+
+ private long hDeptIDField;
+
+ private string hExplanationField;
+
+ private string hInnerBillNoField;
+
+ private bool hRedBlueFlagField;
+
+ private string hStockStyleField;
+
+ private long hSTOCKORGIDField;
+
+ private long hOWNERIDField;
+
+ /// <remarks/>
+ public long HSupID
+ {
+ get
+ {
+ return this.hSupIDField;
+ }
+ set
+ {
+ this.hSupIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HWHID
+ {
+ get
+ {
+ return this.hWHIDField;
+ }
+ set
+ {
+ this.hWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSCWHID
+ {
+ get
+ {
+ return this.hSCWHIDField;
+ }
+ set
+ {
+ this.hSCWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HEmpID
+ {
+ get
+ {
+ return this.hEmpIDField;
+ }
+ set
+ {
+ this.hEmpIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HManagerID
+ {
+ get
+ {
+ return this.hManagerIDField;
+ }
+ set
+ {
+ this.hManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSecManagerID
+ {
+ get
+ {
+ return this.hSecManagerIDField;
+ }
+ set
+ {
+ this.hSecManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HKeeperID
+ {
+ get
+ {
+ return this.hKeeperIDField;
+ }
+ set
+ {
+ this.hKeeperIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HDeptID
+ {
+ get
+ {
+ return this.hDeptIDField;
+ }
+ set
+ {
+ this.hDeptIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HExplanation
+ {
+ get
+ {
+ return this.hExplanationField;
+ }
+ set
+ {
+ this.hExplanationField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HInnerBillNo
+ {
+ get
+ {
+ return this.hInnerBillNoField;
+ }
+ set
+ {
+ this.hInnerBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HRedBlueFlag
+ {
+ get
+ {
+ return this.hRedBlueFlagField;
+ }
+ set
+ {
+ this.hRedBlueFlagField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HStockStyle
+ {
+ get
+ {
+ return this.hStockStyleField;
+ }
+ set
+ {
+ this.hStockStyleField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSTOCKORGID
+ {
+ get
+ {
+ return this.hSTOCKORGIDField;
+ }
+ set
+ {
+ this.hSTOCKORGIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HOWNERID
+ {
+ get
+ {
+ return this.hOWNERIDField;
+ }
+ set
+ {
+ this.hOWNERIDField = value;
+ }
+ }
+ }
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
[System.SerializableAttribute()]
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0a589b6..f69785c 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -33,7 +33,7 @@
<!--<add key="sUrl" value="http://122.227.133.186:8090/WEBS/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>--> <!--娴嬭瘯鏈嶅姟鍣�-->
- <add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> <!--鏈湴-->
+ <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> --><!--鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
<!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 572abbb..1c8db44 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -32,6 +32,7 @@
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
@@ -39,3 +40,5 @@
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
+>>>>>>> 033d6d49fbb0a924653c7fd3ef3700a24f37ee59
--
Gitblit v1.9.1