From a65397862dafc68ee77646f4162f0155b99a7588 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 09 十月 2024 15:44:23 +0800
Subject: [PATCH] 质量管理 首巡末 库存检验 自检 优化
---
DAL/质检管理/ClsQC_FirstPieceCheckBill.cs | 10 +
PayM/bin/Debug/Pub_Control.pdb | 0
PayM/obj/Debug/AxInterop.gregn6Lib.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 1
Model/质检管理/ClsQC_WorkSelfCheckBillSub.cs | 2
PayM/bin/Debug/SQLHelper.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 67 +++++++++-
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs | 9
PayM/bin/Debug/BLL.pdb | 0
PayM/bin/Debug/Interop.gregn6Lib.dll | 0
PayM/bin/Debug/SQLHelper.pdb | 0
PayM/obj/Debug/PayM.pdb | 0
PayM/bin/Debug/DBUtility.dll | 0
PayM/bin/Debug/Pub_Control.dll | 0
PayM/bin/Debug/AxInterop.gregn6Lib.dll | 0
DAL/质检管理/ClsQC_ProcessCheckBill.cs | 16 +
PayM/bin/Debug/BLL.dll | 0
PayM/bin/Debug/DAL.pdb | 0
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 1
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 169 ++++++++++++++++++---------
PayM/bin/Debug/Pub_Class.pdb | 0
PayM/obj/Debug/Interop.gregn6Lib.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
PayM/bin/Debug/Model.dll | 0
DAL/质检管理/ClsQC_PatrolProcCheckOtherBill.cs | 5
PayM/bin/Debug/PayM.dll | 0
PayM/bin/Debug/Model.pdb | 0
PayM/bin/Debug/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
LMES/DingDing_autoGetData.cs | 1
PayM/bin/Debug/DAL.dll | 0
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 4
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 17 +-
PayM/obj/Debug/PayM.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
DAL/质检管理/ClsQC_WorkSelfCheckBill.cs | 8
WebAPI/Controllers/品质管理/车间自检单/QC_WorkSelfCheckBillController.cs | 3
PayM/bin/Debug/DBUtility.pdb | 0
PayM/bin/Debug/PayM.pdb | 0
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 1
42 files changed, 219 insertions(+), 95 deletions(-)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
index c4a96db..0717e5d 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
@@ -82,6 +82,7 @@
//",HSupID=" + omodel.HSupID.ToString() +
//",HEmpID=" + omodel.HEmpID.ToString() +
",HSourceID=" + omodel.HSourceID.ToString() +
+ ",HQCSchemeID=" + omodel.HQCSchemeID.ToString() +
",HICMOInterID=" + omodel.HICMOInterID.ToString() +
",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
",HICMOQty=" + omodel.HICMOQty.ToString() +
@@ -89,6 +90,7 @@
",HProcExchEntryID=" + omodel.HProcExchEntryID.ToString() +
",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
",HProcExchQty=" + omodel.HProcExchQty.ToString() +
+ ",HProcID=" + omodel.HProcID.ToString() +
",HMaterID=" + omodel.HMaterID.ToString() +
",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
",HLastResult=" + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
@@ -109,13 +111,13 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
- ",HMax,HMin,HAvg,HInspectVal" +
+ ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID" +
") 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.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','"+ oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID + "'" +
") ");
}
//foreach (Model.ClsQC_FirstPieceCheckBillSub_Item oSub2 in DetailColl1)
@@ -208,14 +210,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID" +
") " +
" 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.HTakeSampleCheckBillID + ",'"+ omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in DetailColl)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
index f6074a5..5f8a05c 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
@@ -61,6 +61,7 @@
",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
",HLastResult=" + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
",HShiftsID=" + omodel.HShiftsID.ToString() +
+ ",HProcID=" + omodel.HProcID.ToString() +
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
" where HInterID=" + lngBillKey.ToString());
@@ -123,14 +124,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID" +
") " +
" 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.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckOtherBillSub oSub in DetailColl)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs"
index 23b5064..4e0774f 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs"
@@ -123,15 +123,21 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" +
- ",HProcCheckEmp,HProcCheckTime" +
- ") values("
+ ",HProcCheckEmp,HProcCheckTime, HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
+ ",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
+ ",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ",HQCNote) 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.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "','" + oSub.HResult + "'" +
- "," + oSub.HProcCheckEmp.ToString() + ",'" + oSub.HProcCheckTime + "'" +
+ "," + oSub.HProcCheckEmp.ToString() + ",'" + oSub.HProcCheckTime + "'," + 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.HQCNote + "'" +
") ");
}
+
//foreach (Model.ClsQC_ProcessCheckBillSuboSub in DetailColl)
//{
@@ -236,7 +242,7 @@
",HProcCheckEmp,HProcCheckTime, HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ") values("
+ ",HQCNote,HMax,HMin,HAvg) 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() +
@@ -244,7 +250,7 @@
"," + oSub.HProcCheckEmp.ToString() + ",'" + oSub.HProcCheckTime + "'," + 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.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
") ");
}
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBill.cs"
index b4124cd..3fd6c8b 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBill.cs"
@@ -57,6 +57,7 @@
",HProcExchEntryID=" + omodel.HProcExchEntryID.ToString() +
",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
",HProcExchQty=" + omodel.HProcExchQty.ToString() +
+ ",HProcID=" + omodel.HProcID.ToString() +
",HMaterID=" + omodel.HMaterID.ToString() +
",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
",HLastResult=" + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
@@ -89,7 +90,7 @@
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + 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 + "'" + ") ");
}
@@ -122,12 +123,13 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment" +
+ ",HProcID" +
") " +
" 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.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HProcID + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_WorkSelfCheckBillSub oSub in DetailColl)
@@ -148,7 +150,7 @@
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + 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 + "'" + ") ");
}
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
diff --git a/LMES/DingDing_autoGetData.cs b/LMES/DingDing_autoGetData.cs
index 1c1c941..8e9b291 100644
--- a/LMES/DingDing_autoGetData.cs
+++ b/LMES/DingDing_autoGetData.cs
@@ -101,6 +101,7 @@
#region 瀹氭椂鍣ㄤ簩锛氬悓姝ラ拤閽夋暟鎹�
private void timer2_Tick(object sender, EventArgs e)
{
+ //this.timer2.Enabled = false;
int connectTimes = 0;
int maxConnectTimes = 10;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBillSub.cs"
index 06c4a1a..cf19baa 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_WorkSelfCheckBillSub.cs"
@@ -20,7 +20,7 @@
public string HInSpectValT;
public string HDefectLevel;
public bool HDestructInspect;
- public double HKeyInspect;
+ public bool HKeyInspect;
public string HStatus;
public Int64 HSampleQty;
public Int64 HSampleSchemeID;
diff --git a/PayM/bin/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/Debug/AxInterop.gregn6Lib.dll
index dcca299..877dc5c 100644
--- a/PayM/bin/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/Debug/BLL.dll b/PayM/bin/Debug/BLL.dll
index 10d4a0a..a5e2454 100644
--- a/PayM/bin/Debug/BLL.dll
+++ b/PayM/bin/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/Debug/BLL.pdb b/PayM/bin/Debug/BLL.pdb
index e037880..18625b6 100644
--- a/PayM/bin/Debug/BLL.pdb
+++ b/PayM/bin/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/Debug/DAL.dll b/PayM/bin/Debug/DAL.dll
index b82b232..dc737d0 100644
--- a/PayM/bin/Debug/DAL.dll
+++ b/PayM/bin/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/Debug/DAL.pdb b/PayM/bin/Debug/DAL.pdb
index e63d9b4..ac563dd 100644
--- a/PayM/bin/Debug/DAL.pdb
+++ b/PayM/bin/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/Debug/DBUtility.dll b/PayM/bin/Debug/DBUtility.dll
index 2b2cb63..3cea673 100644
--- a/PayM/bin/Debug/DBUtility.dll
+++ b/PayM/bin/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/Debug/DBUtility.pdb b/PayM/bin/Debug/DBUtility.pdb
index 8a9baeb..5734eb1 100644
--- a/PayM/bin/Debug/DBUtility.pdb
+++ b/PayM/bin/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Interop.gregn6Lib.dll b/PayM/bin/Debug/Interop.gregn6Lib.dll
index 38438ed..9deaf25 100644
--- a/PayM/bin/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/Debug/Model.dll b/PayM/bin/Debug/Model.dll
index 9ff3121..030bf62 100644
--- a/PayM/bin/Debug/Model.dll
+++ b/PayM/bin/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/Debug/Model.pdb b/PayM/bin/Debug/Model.pdb
index 8e0b283..64ef3a1 100644
--- a/PayM/bin/Debug/Model.pdb
+++ b/PayM/bin/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/Debug/PayM.dll b/PayM/bin/Debug/PayM.dll
index b7c5581..67c9c22 100644
--- a/PayM/bin/Debug/PayM.dll
+++ b/PayM/bin/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/Debug/PayM.pdb b/PayM/bin/Debug/PayM.pdb
index fe38585..a3ccb8f 100644
--- a/PayM/bin/Debug/PayM.pdb
+++ b/PayM/bin/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Class.dll b/PayM/bin/Debug/Pub_Class.dll
index 36ab673..15122d7 100644
--- a/PayM/bin/Debug/Pub_Class.dll
+++ b/PayM/bin/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Class.pdb b/PayM/bin/Debug/Pub_Class.pdb
index a90decd..8d4a205 100644
--- a/PayM/bin/Debug/Pub_Class.pdb
+++ b/PayM/bin/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Control.dll b/PayM/bin/Debug/Pub_Control.dll
index b65ed25..04c1392 100644
--- a/PayM/bin/Debug/Pub_Control.dll
+++ b/PayM/bin/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Control.pdb b/PayM/bin/Debug/Pub_Control.pdb
index a73d128..a1b2a96 100644
--- a/PayM/bin/Debug/Pub_Control.pdb
+++ b/PayM/bin/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/Debug/SQLHelper.dll b/PayM/bin/Debug/SQLHelper.dll
index 92ac54b..47ac68c 100644
--- a/PayM/bin/Debug/SQLHelper.dll
+++ b/PayM/bin/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/Debug/SQLHelper.pdb b/PayM/bin/Debug/SQLHelper.pdb
index 11c0b55..898000e 100644
--- a/PayM/bin/Debug/SQLHelper.pdb
+++ b/PayM/bin/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/Debug/AxInterop.gregn6Lib.dll b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
index dcca299..877dc5c 100644
--- a/PayM/obj/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/Interop.gregn6Lib.dll b/PayM/obj/Debug/Interop.gregn6Lib.dll
index 38438ed..9deaf25 100644
--- a/PayM/obj/Debug/Interop.gregn6Lib.dll
+++ b/PayM/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/PayM.dll b/PayM/obj/Debug/PayM.dll
index b7c5581..67c9c22 100644
--- a/PayM/obj/Debug/PayM.dll
+++ b/PayM/obj/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/Debug/PayM.pdb b/PayM/obj/Debug/PayM.pdb
index fe38585..a3ccb8f 100644
--- a/PayM/obj/Debug/PayM.pdb
+++ b/PayM/obj/Debug/PayM.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..b04aad7
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 7b63970..3c2e93b 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,3 +3,4 @@
E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index daace44..faf4efb 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -734,6 +734,7 @@
ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill");
if (ds.Tables[0].Rows.Count == 0)
{
+ //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
if (HBarCode.Length == 29)
{
string str1 = HBarCode.Substring(18, 8);
@@ -741,7 +742,7 @@
DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID="+ HOrgID, "Sc_ProcessExchangeBillMain");
+where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count == 0)
{
@@ -767,7 +768,33 @@
return get_HBardBillSave(HProcExchBillNo, HBarCode);
}
}
- else {
+ else
+ {
+ ClsPub.CurUserName = user;
+ //鏉＄爜鐢熸垚
+ return get_HBardBillSave(HProcExchBillNo, HBarCode);
+ }
+ }
+ //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
+ else if (HBarCode.Length == 50)
+ {
+ string str1 = HBarCode.Substring(42, 8);
+
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
ClsPub.CurUserName = user;
//鏉＄爜鐢熸垚
return get_HBardBillSave(HProcExchBillNo, HBarCode);
@@ -783,19 +810,41 @@
}
}
else {
-
- string str1 = HBarCode.Substring(18, 8);
+ //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
+ if (HBarCode.Length == 29)
+ {
+ string str1 = HBarCode.Substring(18, 8);
- DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
- if (dataSet.Tables[0].Rows.Count == 0)
- {
- str1 = HBarCode.Substring(23, 3);
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ str1 = HBarCode.Substring(23, 3);
- dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+ dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
+ else if (HBarCode.Length == 50)
+ {
+ string str1 = HBarCode.Substring(42, 8);
+
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 51bba58..d0636a7 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -578,10 +578,10 @@
Where a.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
) a
inner join (
-select a.HICMOInterID,a.HICMOEntryID, b.HProcID
+select a.HICMOInterID,a.HICMOEntryID,isnull(c.HItemID,0) HProcID
from Sc_PPBomBillMain a with(nolock)
inner join Sc_PPBomBillSub b with(nolock) on a.HInterID=b.HInterID
-Where b.HKeyMaterID_Line<>0
+left join Gy_Process c on b.HProcName = c.HName
)b on a.HICMOInterID=b.HICMOInterID and a.HICMOEntryID=b.HICMOEntryID and a.HProcID=b.HProcID", "Sc_ProcessExchangeBillMain");
if (ds.Tables[0].Rows.Count > 0) {
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 99abdc1..2ef736a 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -883,14 +883,15 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
- if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
- {
- objJsonResult.Verify = "Y";
- }
- else
- {
- objJsonResult.Verify = "N";
- }
+ objJsonResult.Verify = "Y";
+ //if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ //{
+ // objJsonResult.Verify = "Y";
+ //}
+ //else
+ //{
+ // objJsonResult.Verify = "N";
+ //}
}
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
index 0a0f39f..9c38576 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
@@ -177,6 +177,7 @@
BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+ BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
@@ -230,10 +231,10 @@
oSub.HInspectValB = DBUtility.ClsPub.isLong(mainList[0].HInspectValB == null ? 0 : mainList[0].HInspectValB);
oSub.HTargetValB = DBUtility.ClsPub.isLong(mainList[0].HTargetValB == null ? 0 : mainList[0].HTargetValB);
- oSub.HInspectVal= DBUtility.ClsPub.isStrNull(mainList[0].HInspectVal);
- oSub.HTargetVal= DBUtility.ClsPub.isStrNull(mainList[0].HTargetVal);
- oSub.HUpLimit= DBUtility.ClsPub.isStrNull(mainList[0].HUpLimit);
- oSub.HDownLimit= DBUtility.ClsPub.isStrNull(mainList[0].HDownLimit);
+ oSub.HInspectVal= DBUtility.ClsPub.isStrNull(subList[i].HInspectVal);
+ oSub.HTargetVal= DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
+ oSub.HUpLimit= DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
+ oSub.HDownLimit= DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
//*
oSub.HUpOffSet= DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
oSub.HDownOffSet= DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index 0095bd2..ab1c5dd 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -880,6 +880,7 @@
oSub.HTargetVal = DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
oSub.HUpLimit = DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
oSub.HDownLimit = DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
+ oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);
oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
index be696a8..8efdb66 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
@@ -138,6 +138,7 @@
BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
+ BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
@@ -197,7 +198,7 @@
oSub.HUpOffSet= DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
oSub.HDownOffSet= DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
- oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
+ oSub.HKeyInspect = DBUtility.ClsPub.isBool(subList[i].HKeyInspect);
oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
BillNew.DetailColl.Add(oSub);
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index 3d60667..b0ba0c8 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -252,6 +252,7 @@
BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
+ BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index df0bb97..4bb6860 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -276,11 +276,14 @@
public string HNewModel;// varchar(100) --缁翠慨鍚庢柊瑙勬牸 addnew
public Single HNewDesignLife;// money --鏂拌璁″鍛�
public string HRemark;
+ public string HPlanNo;
+ public string HPlanInterID;
public DateTime HRequestComDate;
public double HRecentMainModule;
public double HCumulativeModule;
public double HProductionModule;
public DateTime HRepairAccepDate;
+ public string HMaintainLevID;
@@ -523,8 +526,8 @@
//OriginatorId = "12", //鏍规嵁娴佺▼鍙戣捣浜哄伐鍙锋煡璇€��
//TaskId = "12", //浠诲姟ID銆�
- //CreateFromTimeGMT = DateTime.Now.AddMonths(-10).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
- //CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //鍒涘缓鏃堕棿缁堟鍊笺��
+ //CreateFromTimeGMT = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
+ //CreateToTimeGMT = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd hh:mm:ss"), //鍒涘缓鏃堕棿缁堟鍊笺��
ModifiedFromTimeGMT = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"), //淇敼鏃堕棿璧峰鍊笺��
ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //淇敼鏃堕棿缁堟鍊笺��
@@ -2071,7 +2074,7 @@
if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
{
- continue;
+ //continue;
}
//寮�鍗曟棩鏈�
@@ -2079,6 +2082,30 @@
{
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq0v65sv"].ToString());
oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm");
+ }
+
+ //妯″叿淇濆吇绾у埆
+ if (keys.Contains("selectField_m1ip9j31"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_m1ip9j31"].ToString();
+ if (!HDate_Temp.Contains("涓夌骇"))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MaintainLev where 淇濆吇绾у埆浠ｇ爜='BY-SE-002'", "h_v_Gy_MaintainLev");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HDate_Temp = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+ else if (HDate_Temp.Contains("涓夌骇"))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MaintainLev where 淇濆吇绾у埆浠ｇ爜='BY-SE-003'", "h_v_Gy_MaintainLev");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HDate_Temp = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+
+ oItem.HMaintainLevID = HDate_Temp;
}
//淇ā寮�濮嬫椂闂�
@@ -2149,6 +2176,17 @@
}
oItem.HMouldID = long.Parse(HMouldID);
oItem.HRemark = HDate_Temp;
+
+
+ //鏌ヨ淇濆吇璁″垝
+ ds = oCN.RunProcReturn(@"select a.HInterID,a.HBillNo from Sc_MouldMaintainPlanBillMain a
+ inner join Sc_MouldMaintainPlanBillSub b on a.HInterID = b.HInterID
+ where a.HMouldID =" + oItem.HMouldID + " and a.HMaintainLevID = " + oItem.HMaintainLevID, "Sc_MouldMaintainPlanBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0) {
+ oItem.HPlanInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ oItem.HPlanNo = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ }
}
@@ -2369,13 +2407,15 @@
",HPlanNo,HPlanInterID,HMouldID,HBeginDate" +
",HEndDate" +
",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
- ",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule)" +
+ ",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule" +
+ ",HPlanInterID,HPlanNo,HMaintainLevID)" +
"values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + oItem.HBillNo + "','"+ oItem.HDate + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HUpdateDate + "'" +
",'','0','" + oItem.HMouldID + "','" + oItem.HRepairBeginDate + "'" +
",'" + oItem.HRepairEndDate + "'" +
",'" + oItem.HInstanceID + "','',"+ HMouldMaintainRuleInterID + ",0,'OK'" +
- ",'"+ oItem.HRequestComDate + "'," + oItem.HRecentMainModule + "," + oItem.HCumulativeModule + "," + oItem.HProductionModule + ")";
+ ",'"+ oItem.HRequestComDate + "'," + oItem.HRecentMainModule + "," + oItem.HCumulativeModule + "," + oItem.HProductionModule + "" +
+ "," + oItem.HPlanInterID + "," + oItem.HPlanNo + "," + oItem.HMaintainLevID + ")";
LogService.Write(sql_main);
oCN.RunProc(sql_main);
int i = 1;
@@ -2522,6 +2562,72 @@
continue;
}
+ if (oItem.HInstanceID != "9b6e108c-b7bf-45e4-910d-5629ac30d4aa") {
+ continue;
+ }
+
+ //璁惧缂栫爜
+ if (keys.Contains("textField_lfg9hgys"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
+ string HEquipID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ oItem.HEquipID = long.Parse(HEquipID);
+ oItem.HRemark2 = HDate_Temp;
+ }
+ else
+ {
+ continue;
+ }
+ }
+
+ //缁翠慨閮ㄩ棬
+ if (keys.Contains("selectField_kzgkw10a"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_kzgkw10a"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + HDate_Temp + "'", "Gy_Department");
+ string HDeptID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ oItem.HDeptID = long.Parse(HDeptID);
+ }
+ else
+ {
+ continue;
+ }
+
+ }
+
+ //缁翠慨浜�
+ if (keys.Contains("employeeField_lthwkdh2"))
+ {
+ string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lthwkdh2"]));
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + HDate_Temp[0] + "'", "Gy_Employee");
+ string HEmpID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ oItem.HEmpID = long.Parse(HEmpID);
+ }
+ else
+ {
+ continue;
+ }
+
+ }
+
+ //缁翠慨鍐呭
+ if (keys.Contains("textField_l2r9bvwk"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_l2r9bvwk"].ToString();
+
+ oItem.HRepairContent = HDate_Temp;
+ }
+
//鎶ヤ慨绫诲埆
if (keys.Contains("multiSelectField_lfg9hgyv"))
{
@@ -2564,60 +2670,11 @@
{
HDate_Temp = "0";
}
- LogService.Write("1:------"+HDate_Temp+ ",2:------" + int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray())));
+ //LogService.Write("1:------"+HDate_Temp+ ",2:------" + int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray())));
//a = HDate_Temp;
oItem.HTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
oItem.HPlanTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
}
-
- //璁惧缂栫爜
- if (keys.Contains("textField_lfg9hgys"))
- {
- string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
- DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
- string HEquipID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- {
- HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
- }
- oItem.HEquipID = long.Parse(HEquipID);
- oItem.HRemark2 = HDate_Temp;
- }
-
- //缁翠慨閮ㄩ棬
- if (keys.Contains("selectField_kzgkw10a"))
- {
- string HDate_Temp = response.Body.Result[i].FormData["selectField_kzgkw10a"].ToString();
- DataSet ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + HDate_Temp + "'", "Gy_Department");
- string HDeptID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- {
- HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- }
- oItem.HDeptID = long.Parse(HDeptID);
- }
-
- //缁翠慨浜�
- if (keys.Contains("employeeField_lthwkdh2"))
- {
- string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lthwkdh2"]));
- DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + HDate_Temp[0] + "'", "Gy_Employee");
- string HEmpID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- {
- HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- }
- oItem.HEmpID = long.Parse(HEmpID);
- }
-
- //缁翠慨鍐呭
- if (keys.Contains("textField_l2r9bvwk"))
- {
- string HDate_Temp = response.Body.Result[i].FormData["textField_l2r9bvwk"].ToString();
-
- oItem.HRepairContent = HDate_Temp;
- }
-
//瀛愯〃 缁翠慨瑕佹眰 缁翠慨澶囨敞(闂鎻忚堪)
@@ -2673,7 +2730,7 @@
}
catch (Exception e)
{
- //LogService.Write(a);
+ LogService.Write(e.Message);
a = "";
continue;
}
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 7e03b04..468fc1d 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 8e45d69..5b27016 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 7e03b04..468fc1d 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 8e45d69..5b27016 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1