From 274797268b0215daf61d72d869e2d4fe31e19d3b Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期五, 26 一月 2024 14:17:27 +0800 Subject: [PATCH] PDA(工序/首件检验单)增加检验项目信息 --- WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 80 ++++++++++++++++++++++++++ WebAPI/Controllers/品质管理/工序检验单/MES_ProcessCheckBill_PDAController.cs | 80 ++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 4 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs index 98940fd..8085b07 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs @@ -785,6 +785,7 @@ string msg2 = "[" + sArray[0].ToString() + "]"; string user = sArray[1].ToString();//鐢ㄦ埛鍚� string OperationType = sArray[2].ToString();//绫诲瀷 + string msg_entry = sArray[3].ToString(); //鏄庣粏琛屼俊鎭� //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Edit", 1, false, user)) @@ -795,6 +796,8 @@ objJsonResult.data = null; return objJsonResult; } + + DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill(); List<Model.ClsQC_FirstPieceCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillMain>>(msg2); string BillType = "7505"; @@ -807,6 +810,7 @@ double HPeriod = DateTime.Now.Month; long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮 long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D + long HICMOEntryID = list[0].HICMOEntryID;//浠诲姟鍗曞瓙ID string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗� string HProcExchBillNo = list[0].HProcExchBillNo;//鎸囧紩鍗� long HMaterID = list[0].HMaterID;//浜у搧ID @@ -814,6 +818,60 @@ long HProcID = list[0].HProcID;//宸ュ簭ID long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID bool HLastResult = list[0].HLastResult;//璇曟牱缁撹 + + //琛ㄤ綋鏁版嵁 + List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg_entry); + for (int i = 0; i < subList.ToArray().Length; i++) + { + if (subList.ToArray().Length >= 0) + { + Model.ClsQC_FirstPieceCheckBillSub oSub = new Model.ClsQC_FirstPieceCheckBillSub(); + oSub.HEntryID = i + 1; + oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark); + oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID); + oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID); + oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType); + oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan); + oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType); + oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID); + oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd); + oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult); + //oSub.HProcCheckTime = HDate; + //oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo); + //oSub.HProcCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp); + oSub.HSampleSchemeID = DBUtility.ClsPub.isLong(subList[i].HSampleSchemeID); + oSub.HSampleQty = DBUtility.ClsPub.isLong(subList[i].HSampleQty); + oSub.HSampleDamageQty = DBUtility.ClsPub.isDoule(subList[i].HSampleDamageQty); + oSub.HAcceptQty = DBUtility.ClsPub.isLong(subList[i].HAcceptQty); + oSub.HRejectQty = DBUtility.ClsPub.isLong(subList[i].HRejectQty); + oSub.HSampleUnRightQty = DBUtility.ClsPub.isDoule(subList[i].HSampleUnRightQty); + oSub.HStatus = DBUtility.ClsPub.isStrNull(subList[i].HStatus); + oSub.HUnitID = DBUtility.ClsPub.isLong(subList[i].HUnitID); + 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); + oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod); + oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect); + oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID); + oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "true" ? 1 : 0); + + BillNew.DetailColl.Add(oSub); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!"; + objJsonResult.data = null; + return objJsonResult; + } + } //鍗曟嵁瀹屾暣鎬у垽鏂� if (HProcExchBillNo == "") @@ -844,11 +902,29 @@ } oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + - ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOBillNo,HProcExchBillNo" + + ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" + ",HPRDORGID,HLastResult)" + " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" + - "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" + + "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" + "," + HPRDORGID + ",'" + HLastResult + "') "); + + //鎻掑叆瀛愯〃 + foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in BillNew.DetailColl) + { + oCN.RunProc("Insert into QC_FirstPieceCheckBillSub " + + " (HInterID,HBillNo_bak,HEntryID" + + ",HRemark,HSourceInterID" + + ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HQCCheckItemID,HQCStd,HResult" + + ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" + + ") values(" + + HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HICMOInterID.ToString() + + "," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HResult + "'" + + ",'" + oSub.HStatus + + "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + + ") "); + } } else { diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs" index 0091e7f..feef7f9 100644 --- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs" +++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs" @@ -34,6 +34,7 @@ string msg2 = "[" + sArray[0].ToString() + "]"; string user = sArray[1].ToString();//鐢ㄦ埛鍚� string OperationType = sArray[2].ToString();//绫诲瀷 + string msg_entry = sArray[3].ToString(); //鏄庣粏琛屼俊鎭� //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Edit", 1, false, user)) @@ -44,6 +45,7 @@ objJsonResult.data = null; return objJsonResult; } + DAL.ClsQC_ProcessCheckBill BillNew = new DAL.ClsQC_ProcessCheckBill(); List<Model.ClsQC_ProcessCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillMain>>(msg2); string BillType = "7507"; @@ -56,6 +58,7 @@ double HPeriod = DateTime.Now.Month; long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮 long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D + long HICMOEntryID = list[0].HICMOEntryID;//浠诲姟鍗曞瓙ID string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗� string HProcExchBillNo = list[0].HProcExchBillNo;//鎸囧紩鍗� long HMaterID = list[0].HMaterID;//浜у搧ID @@ -63,6 +66,61 @@ long HProcID = list[0].HProcID;//宸ュ簭ID long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID bool HLastResult = list[0].HLastResult;//璇曟牱缁撹 + + //琛ㄤ綋鏁版嵁 + List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg_entry); + for (int i = 0; i < subList.ToArray().Length; i++) + { + if (subList.ToArray().Length >= 0) + { + Model.ClsQC_ProcessCheckBillSub oSub = new Model.ClsQC_ProcessCheckBillSub(); + oSub.HEntryID = i + 1; + oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark); + oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID); + oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID); + oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType); + oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan); + oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType); + oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID); + oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd); + oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult); + oSub.HQCRelValue = DBUtility.ClsPub.isStrNull(subList[i].HQCRelValue); + //oSub.HProcCheckTime = HDate; + //oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo); + //oSub.HProcCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp); + oSub.HSampleSchemeID = DBUtility.ClsPub.isLong(subList[i].HSampleSchemeID); + oSub.HSampleQty = DBUtility.ClsPub.isLong(subList[i].HSampleQty); + oSub.HSampleDamageQty = DBUtility.ClsPub.isDoule(subList[i].HSampleDamageQty); + oSub.HAcceptQty = DBUtility.ClsPub.isLong(subList[i].HAcceptQty); + oSub.HRejectQty = DBUtility.ClsPub.isLong(subList[i].HRejectQty); + oSub.HSampleUnRightQty = DBUtility.ClsPub.isDoule(subList[i].HSampleUnRightQty); + oSub.HStatus = DBUtility.ClsPub.isStrNull(subList[i].HStatus); + oSub.HUnitID = DBUtility.ClsPub.isLong(subList[i].HUnitID); + 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); + oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod); + oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect); + oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID); + oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "true" ? 1 : 0); + + BillNew.DetailColl.Add(oSub); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!"; + objJsonResult.data = null; + return objJsonResult; + } + } //鍗曟嵁瀹屾暣鎬у垽鏂� if (HProcExchBillNo == "") @@ -93,11 +151,29 @@ } oCN.RunProc("Insert Into QC_ProcessCheckBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + - ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOBillNo,HProcExchBillNo" + + ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" + ",HPRDORGID,HLastResult)" + " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" + - "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" + + "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" + "," + HPRDORGID + ",'" + HLastResult + "') "); + + //鎻掑叆瀛愯〃 + foreach (Model.ClsQC_ProcessCheckBillSub oSub in BillNew.DetailColl) + { + oCN.RunProc("Insert into QC_ProcessCheckBillSub " + + " (HInterID,HBillNo_bak,HEntryID" + + ",HRemark,HSourceInterID" + + ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" + + ",HProcCheckEmp,HProcCheckTime,HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" + + ") values(" + + HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HICMOInterID.ToString() + + "," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "','" + oSub.HResult + "'" + + "," + oSub.HProcCheckEmp.ToString() + ",GETDATE()" + ",'" + oSub.HStatus + + "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + + ") "); + } } else { -- Gitblit v1.9.1