1
wtt
20 小时以前 1ae6d87bb3fde2c10b4da671705ddc8977bc30b9
1
25个文件已修改
591 ■■■■■ 已修改文件
DAL/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/质检管理/ClsQC_LastPieceCheckBill.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/质检管理/ClsQC_OutCompCheckBill.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/质检管理/ClsQC_POStockInCheckBill.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_LastPieceCheckBillMain.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_LastPieceCheckBillSub.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_OutCompCheckBillSub.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_POStockInCheckBillMain.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_POStockInCheckBillSub.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs 247 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/QC_POStockInCheckBillController.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/Reference.cs 233 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.dll
Binary files differ
DAL/bin/Release/DAL.pdb
Binary files differ
DAL/bin/Release/Model.dll
Binary files differ
DAL/bin/Release/Model.pdb
Binary files differ
DAL/Öʼì¹ÜÀí/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)
                //{
DAL/Öʼì¹ÜÀí/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)
DAL/Öʼì¹ÜÀí/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)
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
Model/bin/Release/Model.dll
Binary files differ
Model/bin/Release/Model.pdb
Binary files differ
Model/obj/Release/Model.dll
Binary files differ
Model/obj/Release/Model.pdb
Binary files differ
Model/Öʼì¹ÜÀí/ClsQC_LastPieceCheckBillMain.cs
@@ -49,5 +49,7 @@
        public string HBatchNo;
        public string HTakeSampleCheckBillNo;
        public string HRemarkSN;
    }
}
Model/Öʼì¹ÜÀí/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;
Model/Öʼì¹ÜÀí/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;
Model/Öʼì¹ÜÀí/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;
Model/Öʼì¹ÜÀí/ClsQC_POStockInCheckBillSub.cs
@@ -47,6 +47,7 @@
        public Int64 HQualityStdID;     // è´¨é‡æ ‡å‡†
        public Int64 HInspectMethodID;  // æ£€éªŒæ–¹æ³•
        public Int64 HInspectBasisID;   // æ£€éªŒä¾æ®
        public decimal HInspectValQ; // æ£€éªŒå€¼(定量分析)
    }
}
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 ç”Ÿæˆé‡‘蝶单据(先保存到mes本地,通过本地调用生成金蝶单据)
                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得到的单据ID
                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>
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
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
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);
                    }
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>
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()]
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"/>九菱-->
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