From fa6092f59697d131b3929c39fcff991bd4b54c1a Mon Sep 17 00:00:00 2001 From: WYB <908761037@qq.com> Date: 星期六, 17 四月 2021 16:07:27 +0800 Subject: [PATCH] 不良评审保存逻辑完成底层提示存储过程不存在(待修复) --- WebAPI/DLL/ClsQC_NoPassProdCheckBill.cs | 554 ++++++++++++++++++++++++++++++++++++++++++++++++++ WebAPI/Controllers/Sc_ProcessMangementController.cs | 49 +++ WebAPI/Properties/PublishProfiles/API.pubxml.user | 6 WebAPI/WebAPI.csproj | 1 4 files changed, 599 insertions(+), 11 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index bb77118..2a2139f 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -916,7 +916,7 @@ ListModels oListModels = new ListModels(); try { - DAL.ClsQC_NoPassProdCheckBill oBill = new DAL.ClsQC_NoPassProdCheckBill(); + DLL.ClsQC_NoPassProdCheckBill oBill = new DLL.ClsQC_NoPassProdCheckBill(); List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n @@ -927,9 +927,28 @@ UserName=oItem.HMaker; oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); - //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); - //oItem.HCurID = 1; - //oItem.HExRate = 1; + oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); + oItem.HBillType = "7509"; + oItem.HBillSubType = "7509"; + oItem.HBillStatus = 1; + oItem.HPeriod = 0; + oItem.HGroupName =""; + oItem.HSourceID = 0; + oItem.HICMOInterID = 0; + oItem.HICMOBillNo = ""; + oItem.HInStockQty = 0; + oItem.HCheckQty = 0; + oItem.HRightQty = 0; + oItem.HBadPNL = 0; + oItem.HPlanPNL = 0; + oItem.HFirstCheckEmp = 0; + oItem.HCheckerResult = ""; + oItem.HWorkCenterID = 0; + oItem.HProcExchInterID = 0; + oItem.HProcExchEntryID = 0; + oItem.HProcExchBillNo = ""; + oItem.HOrderProcNo = ""; + oItem.HProcExchQty = 0; oItem.HMainSourceInterID = oItem.HInterID; oItem.HInterID = 0; //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo); @@ -937,7 +956,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈塪anju鏃ユ湡锛屾棤娉曚繚瀛橈紒"; + objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�"; objJsonResult.data = 1; return objJsonResult; } @@ -959,6 +978,8 @@ { break; } + //灏嗗墠鍙颁复鏃跺瓨鏀剧殑鍊间紶杩囨潵鐨勫�艰祴缁欏搴旂殑涓嶈壇鏁伴噺瀛楁 + oItemSub.HBadQty = Convert.ToDecimal( oItemSub.HMRBChecker); if (oItemSub.HBadQty<=0) { objJsonResult.code = "0"; @@ -983,12 +1004,24 @@ objJsonResult.data = 1; return objJsonResult; } - + oItemSub.HSourceEntryID = oBill.omodel.HMainSourceEntryID; + oItemSub.HSourceInterID = oBill.omodel.HMainSourceInterID; oItemSub.HEntryID = i; oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); - oItemSub.HRemark = ""; - oItemSub.HCloseMan = ""; oItemSub.HCloseType = false; + oItemSub.HBillNo_bak = oBill.omodel.HBillNo; + oItemSub.HMRBChecker = ""; + oItemSub.HSourceBillNo = oBill.omodel.HMainSourceBillNo; + oItemSub.HSourceBillType = "3715"; + oItemSub.HRelationQty = 0; + oItemSub.HRelationMoney = 0; + oItemSub.HMaterID = oBill.omodel.HMaterID; + oItemSub.HUnitID = 0; + oItemSub.HMustQty = 0; + oItemSub.HDisposeNote = ""; + oItemSub.HPunishmentBillNo = ""; + oItemSub.HBadPCSQty = 0; + oItemSub.HQCResultID = 0; oBill.DetailColl.Add(oItemSub); } diff --git a/WebAPI/DLL/ClsQC_NoPassProdCheckBill.cs b/WebAPI/DLL/ClsQC_NoPassProdCheckBill.cs new file mode 100644 index 0000000..f979d92 --- /dev/null +++ b/WebAPI/DLL/ClsQC_NoPassProdCheckBill.cs @@ -0,0 +1,554 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace WebAPI.DLL +{ + public class ClsQC_NoPassProdCheckBill:DBUtility.ClsXt_BaseBill + { + public Model.ClsQC_NoPassProdCheckBillMain omodel = new Model.ClsQC_NoPassProdCheckBillMain(); + public List<Model.ClsQC_NoPassProdCheckBillSub> DetailColl = new List<Model.ClsQC_NoPassProdCheckBillSub>(); + //public List<Model.ClsQC_NoPassProdCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_NoPassProdCheckBillSub_Item>(); + public ClsQC_NoPassProdCheckBill() + { + base.MvarItemKeySub = "QC_NoPassProdCheckBillSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey="QC_NoPassProdCheckBillMain"; + base.MvarReportTitle="涓嶅悎鏍艰瘎瀹″崟"; + base.BillType="7509"; + base.HBillSubType = "7509"; + + } + + #region 鍥哄畾浠g爜 + + ~ClsQC_NoPassProdCheckBill() + { + DetailColl = null; + } + + #endregion 鑷畾涔夋柟娉� + + + //鍒犻櫎鍗曟嵁 + public override bool DeleteBill(Int64 lngBillKey, ref string sReturn) + { + try + { + oCn.BeginTran(); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + lngBillKey.ToString() + ",-1"); + //鍒犻櫎鏄庣粏琛� + DeleteBillSub(lngBillKey); + DeleteBillSub2(lngBillKey); + DeleteBillSub3(lngBillKey); + DeleteBillSub4(lngBillKey); + //鍒犻櫎涓昏〃 + DeleteBillMain(lngBillKey); + sReturn = "鍒犻櫎鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + + + //淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + // + oCn.BeginTran(); + oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + lngBillKey.ToString() + ",-1"); + //鏇存柊涓昏〃 + oCn.RunProc("UpDate QC_NoPassProdCheckBillMain set " + + " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��=============== + ",HDate='" + omodel.HDate + "'" + + ",HYear='" + omodel.HYear.ToString() + "'" + + ",HPeriod='" + omodel.HPeriod.ToString() + "'" + + ",HBillStatus='" + omodel.HBillStatus + "'" + + ",HRemark='" + omodel.HRemark + "'" + + ",HGroupName='" + omodel.HGroupName + "'" + + //",HBacker='"+omodel.HBacker+"'"+ + //",HBackDate='" + omodel.HBackDate + "'" + + //",HBackRemark='"+omodel.HBackRemark+"'"+ + //",HChecker='" + omodel.HChecker + "'" + + //",HCheckDate='" + omodel.HCheckDate + "'" + + //",HMaker='" + omodel.HMaker + "'" + + //",HMakeDate='" + omodel.HMakeDate + "'" + + ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" + + ",HUpDateDate=getdate()" + + //",HCloseMan='" + omodel.HCloseMan + "'" + + //",HCloseDate='" + omodel.HCloseDate + "'" + + //",HCloseType="+omodel.HCloseType.ToString()+ + //",HDeleteMan='" + omodel.HDeleteMan + "'" + + //",HDeleteDate='" + omodel.HDeleteDate + "'" + + ",HPrintQty="+omodel.HPrintQty.ToString()+ + //======================================== + //",HSupID=" + omodel.HSupID.ToString() + + //",HEmpID=" + omodel.HEmpID.ToString() + + ",HSourceID=" + omodel.HSourceID.ToString() + + ",HProcExchQty=" + omodel.HProcExchQty.ToString() + + ",HICMOInterID=" + omodel.HICMOInterID.ToString() + + ",HICMOBillNo='" + omodel.HICMOBillNo + "'" + + ",HInStockQty=" + omodel.HInStockQty.ToString() + + ",HCheckQty=" + omodel.HCheckQty.ToString() + + ",HRightQty=" + omodel.HRightQty.ToString() + + ",HBadQty=" + omodel.HBadQty.ToString() + + ",HPlanQty=" + omodel.HPlanQty.ToString() + + ",HBadPNL=" + omodel.HBadPNL.ToString() + + ",HPlanPNL=" + omodel.HPlanPNL.ToString() + + ",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() + + ",HOrderProcNo='" + omodel.HOrderProcNo + "'" + + ",HCheckerResult='" + omodel.HCheckerResult + "'" + + ",HNote='" + omodel.HNote + "'" + + + ",HMaterID=" + omodel.HMaterID.ToString() + + ",HProcID=" + omodel.HProcID.ToString() + + //",HProcExchInterID=" + omodel.HProcExchInterID.ToString() + + //",HProcExchEntryID=" + omodel.HProcExchEntryID.ToString() + + //",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" + + + " where HInterID=" + lngBillKey.ToString()); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + foreach (Model.ClsQC_NoPassProdCheckBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into QC_NoPassProdCheckBillSub " + + " (HInterID,HBillNo_bak,HEntryID,HCloseMan,HMRBChecker" + + ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSQProcName,HZRProcName,HPSProcName" + + ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HUnitID,HMustQty,HBadQty,HBadReasonID,HDisposeNote" + + ",HEmpName,HProcID,HWasterReasonName,HPunishmentBillNo,HBadPCSQty,HQCResultID" + + ") values(" + + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HMRBChecker + "'" + + ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + ",'" + oSub.HSQProcName + "','" + oSub.HZRProcName + "','" + oSub.HPSProcName + "'" + + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HMustQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HBadReasonID.ToString() + ",'" + oSub.HDisposeNote + "'" + + ",'" + oSub.HEmpName.ToString() + "'," + oSub.HProcID + ",'" + oSub.HWasterReasonName + "','" + oSub.HPunishmentBillNo + "'," + oSub.HBadPCSQty.ToString() + "," + oSub.HQCResultID.ToString() + + ") "); + } + //foreach (Model.ClsQC_NoPassProdCheckBillSub_Item oSub2 in DetailColl1) + //{ + // oCn.RunProc("Insert into QC_NoPassProdCheckBillSub_Item " + + // " (HInterID,HBillNo_bak,HEntryID,HCloseMan" + + // ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" + + // ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + // ",HMaintainItemID,HMaintainItem,HMaintainPart,HClaim,HManagerID" + + + // ") values(" + // + omodel.HInterID.ToString() + ",'" + oSub2.HBillNo_bak + "'," + oSub2.HEntryID.ToString() + ",'" + oSub2.HCloseMan + "'" + + // ",getdate()," + Convert.ToString(oSub2.HCloseType ? 1 : 0) + ",'" + oSub2.HRemark + "'," + oSub2.HSourceInterID.ToString() + + // "," + oSub2.HSourceEntryID.ToString() + ",'" + oSub2.HSourceBillNo + "','" + oSub2.HSourceBillType + "'," + oSub2.HRelationQty.ToString() + "," + oSub2.HRelationMoney.ToString() + + // "," + oSub2.HMaintainItemID.ToString() + ",'" + oSub2.HMaintainItem + "','" + oSub2.HMaintainPart + "','" + oSub2.HClaim + "'," + oSub2.HManagerID.ToString() + + // ") "); + //} + // + //foreach (Model.ClsQC_NoPassProdCheckBillSub oSub in DetailColl) + //{ + // Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_Qty " + oSub.HICMOInterID, ""); + // if (Ds.Tables[0].Rows.Count == 0) + // return; + // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y") + // { + // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨"; + // return false; + // } + //} + //鏍规嵁鍐呯爜 鍥炲~瀵瑰簲娴佽浆鍗� 涓嶈壇鍏宠仈鏁伴噺 + oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1"); + ////////////////////////////// + //DataSet Ds; + //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl"); + //if (Ds == null || Ds.Tables[0].Rows.Count == 0) + //{ + // oCn.RollBack(); + // return false; + //} + //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2") + //{ + // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]); + // oCn.RollBack(); + // return false; + //} + //////////////////////// + + + // + sReturn = "淇敼鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + //鏂板鍗曟嵁 + public override bool AddBill(ref string sReturn) + { + try + { + //寰楀埌mainid + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + oCn.BeginTran(); + //涓昏〃 + oCn.RunProc("Insert Into QC_NoPassProdCheckBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + + ",HYear,HPeriod,HRemark,HGroupName" + + ",HSourceID,HICMOInterID,HICMOBillNo,HInStockQty,HCheckQty,HRightQty" + + ",HBadQty,HPlanQty,HBadPNL,HPlanPNL,HFirstCheckEmp" + + ",HCheckerResult,HNote,HWorkCenterID" + + ",HMaterID,HProcID,HMainSourceInterID" + + ",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HOrderProcNo,HProcExchQty" + + ") " + + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" + + "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupName.ToString() + "'" + + "," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HInStockQty.ToString() + "," + omodel.HCheckQty.ToString() + "," + omodel.HRightQty.ToString() + + "," + omodel.HBadQty.ToString() + "," + omodel.HPlanQty.ToString() + "," + omodel.HBadPNL.ToString() + "," + omodel.HPlanPNL.ToString() + "," + omodel.HFirstCheckEmp.ToString() + + ",'" + omodel.HCheckerResult + "','" + omodel.HNote + "'," + omodel.HWorkCenterID.ToString() + "" + + "," + omodel.HMaterID + "," + omodel.HProcID + "," + omodel.HMainSourceInterID + + "," + omodel.HProcExchInterID + "," + omodel.HProcExchEntryID + ",'" + omodel.HProcExchBillNo + "','" + omodel.HOrderProcNo + "'," + omodel.HProcExchQty.ToString() + + ") "); + //鎻掑叆瀛愯〃 + foreach (Model.ClsQC_NoPassProdCheckBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into QC_NoPassProdCheckBillSub " + + " (HInterID,HBillNo_bak,HEntryID,HCloseMan,HMRBChecker" + + ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSQProcName,HZRProcName,HPSProcName" + + ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HUnitID,HMustQty,HBadQty,HBadReasonID,HDisposeNote" + + ",HEmpName,HProcID,HWasterReasonName,HPunishmentBillNo,HBadPCSQty,HQCResultID" + + ") values(" + + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HMRBChecker + "'" + + ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + ",'" + oSub.HSQProcName + "','" + oSub.HZRProcName + "','" + oSub.HPSProcName + "'" + + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HMustQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HBadReasonID.ToString() + ",'" + oSub.HDisposeNote + "'" + + ",'" + oSub.HEmpName.ToString() + "'," + oSub.HProcID + ",'" + oSub.HWasterReasonName + "','" + oSub.HPunishmentBillNo + "'," + oSub.HBadPCSQty.ToString() + "," + oSub.HQCResultID.ToString() + + ") "); + } + //foreach (Model.ClsQC_NoPassProdCheckBillSub_Item oSub2 in DetailColl1) + //{ + // oCn.RunProc("Insert into QC_NoPassProdCheckBillSub_Item " + + // " (HInterID,HBillNo_bak,HEntryID,HCloseMan" + + // ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" + + // ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + // ",HMaintainItemID,HMaintainItem,HMaintainPart,HClaim,HManagerID" + + + // ") values(" + // + omodel.HInterID.ToString() + ",'" + oSub2.HBillNo_bak + "'," + oSub2.HEntryID.ToString() + ",'" + oSub2.HCloseMan + "'" + + // ",getdate()," + Convert.ToString(oSub2.HCloseType ? 1 : 0) + ",'" + oSub2.HRemark + "'," + oSub2.HSourceInterID.ToString() + + // "," + oSub2.HSourceEntryID.ToString() + ",'" + oSub2.HSourceBillNo + "','" + oSub2.HSourceBillType + "'," + oSub2.HRelationQty.ToString() + "," + oSub2.HRelationMoney.ToString() + + // "," + oSub2.HMaintainItemID.ToString() + ",'" + oSub2.HMaintainItem + "','" + oSub2.HMaintainPart + "','" + oSub2.HClaim + "'," + oSub2.HManagerID.ToString() + + // ") "); + //} + // + //foreach (Model.ClsQC_NoPassProdCheckBillSub oSub in DetailColl) + //{ + // Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_Qty " + oSub.HICMOInterID, ""); + // if (Ds.Tables[0].Rows.Count == 0) + // return; + // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y") + // { + // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨"; + // return false; + // } + //} + //鏍规嵁鍐呯爜 鍥炲~瀵瑰簲娴佽浆鍗� 涓嶈壇鍏宠仈鏁伴噺 + oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1"); + // + ////////////////////////////// + //DataSet Ds; + //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl"); + //if (Ds == null || Ds.Tables[0].Rows.Count == 0) + //{ + // oCn.RollBack(); + // return false; + //} + //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2") + //{ + // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]); + // oCn.RollBack(); + // return false; + //} + //////////////////////// + + // + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + //鏄剧ず鍗曟嵁 + public override bool ShowBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //鏌ヨ涓昏〃 + DataSet Ds ; + Ds = oCn.RunProcReturn("Select * from QC_NoPassProdCheckBillMain Where HInterID=" + lngBillKey.ToString(), "QC_NoPassProdCheckBillMain"); + if(Ds.Tables[0].Rows.Count==0) + { + sReturn = "鍗曟嵁鏈壘鍒帮紒"; + return false; + } + //鍥哄畾璧嬪��=========================================== + omodel.HInterID =DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]); + omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim(); + omodel.HDate =DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]); + omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]); + omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]); + omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]); + omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]); + omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]); + omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim(); + omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]); + omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]); + omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]); + omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim(); + omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim(); + omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim(); + omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim(); + omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim(); + omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim(); + omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim(); + omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim(); + omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim(); + omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim(); + omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim(); + omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim(); + //======================================================== + ////== + //omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]); + //omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]); + //omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]); + //omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]); + //omodel.HMangerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMangerID"]); + omodel.HSourceID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceID"]); + omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]); + omodel.HICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HICMOBillNo"]); + omodel.HInStockQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInStockQty"]); ; + omodel.HCheckQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckQty"]); + omodel.HRightQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HRightQty"]); + omodel.HBadQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBadQty"]); + omodel.HPlanQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPlanQty"]); + omodel.HBadPNL = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBadPNL"]); + omodel.HPlanPNL = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPlanPNL"]); + omodel.HFirstCheckEmp = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HFirstCheckEmp"]); + omodel.HCheckerResult = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckerResult"]); + omodel.HNote = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HNote"]); + //omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]); + + omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]); + omodel.HWorkCenterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWorkCenterID"]); + omodel.HProcID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcID"]); + omodel.HProcExchInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcExchInterID"]); + omodel.HProcExchEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcExchEntryID"]); + omodel.HProcExchBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcExchBillNo"]); + omodel.HGroupName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HGroupName"]); + omodel.HOrderProcNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HOrderProcNo"]); + omodel.HProcExchQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HProcExchQty"]); + // + + //寰幆 + DataSet DsSub ; + DsSub = oCn.RunProcReturn("Select * from QC_NoPassProdCheckBillSub Where HInterID=" + lngBillKey.ToString(), "QC_NoPassProdCheckBillSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsQC_NoPassProdCheckBillSub oSub = new Model.ClsQC_NoPassProdCheckBillSub(); + // 鍥哄畾璧嬪��=============================================== + oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]); + oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBillNo_bak"]); + oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]); + oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]); + oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]); + oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim(); + oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]); + oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]); + oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim(); + oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim(); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); + //=================================================== + oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]); + oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]); + oSub.HMustQty = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMustQty"]); + oSub.HBadQty = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HBadQty"]); + oSub.HBadReasonID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HBadReasonID"]); + oSub.HDisposeNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDisposeNote"]); + + oSub.HEmpName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HEmpName"]); + oSub.HProcID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcID"]); + oSub.HBadPCSQty = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HBadPCSQty"]); + oSub.HWasterReasonName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWasterReasonName"]); + oSub.HPunishmentBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPunishmentBillNo"]); + oSub.HMRBChecker = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMRBChecker"]); + + oSub.HSQProcName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSQProcName"]); + oSub.HZRProcName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HZRProcName"]); + oSub.HPSProcName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPSProcName"]); + oSub.HQCResultID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HQCResultID"]); + + DetailColl.Add(oSub); + } + //DataSet DsSub2; + //DsSub2 = oCn.RunProcReturn("Select * from QC_NoPassProdCheckBillSub_Item Where HInterID=" + lngBillKey.ToString(), "QC_NoPassProdCheckBillSub_Item"); + //DetailColl1.Clear();//娓呯┖ + //for (int i = 0; i < DsSub2.Tables[0].Rows.Count; i++) + //{ + // Model.ClsQC_NoPassProdCheckBillSub_Item oSub2 = new Model.ClsQC_NoPassProdCheckBillSub_Item(); + // // 鍥哄畾璧嬪��=============================================== + // oSub2.HInterID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HInterID"]); + // oSub2.HEntryID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HEntryID"]); + // oSub2.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HBillNo_bak"]); + // oSub2.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HCloseMan"]); + // oSub2.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub2.Tables[0].Rows[i]["HEntryCloseDate"]); + // oSub2.HCloseType = DBUtility.ClsPub.isBool(DsSub2.Tables[0].Rows[i]["HCloseType"]); + // oSub2.HRemark = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HRemark"]); + // oSub2.HSourceInterID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HSourceInterID"]); + // oSub2.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HSourceEntryID"]); + // oSub2.HSourceBillType = DsSub2.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim(); + // oSub2.HSourceBillNo = DsSub2.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim(); + // oSub2.HRelationQty = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[i]["HRelationQty"]); + // oSub2.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[i]["HRelationMoney"]); + // //=================================================== + // //oSub.HWorkerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWorkerID"]); + // //oSub.HWorkerNumber = DsSub.Tables[0].Rows[i]["HWorkerNumber"].ToString().Trim(); + // //oSub.HSourceID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceID"]); + // //oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]); + // //oSub.HPropertyID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPropertyID"]); + // //oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]); + // //oSub.HSecUnitRate = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSecUnitRate"]); + // //oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]); + // //oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]); + // //oSub.HQtyMust = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HQtyMust"]); + // //oSub.HQty = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HQty"]); + // //oSub.HPrice = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPrice"]); + // //oSub.HMoney = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMoney"]); + // //oSub.HDesignLife = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDesignLife"]); + // //oSub.HLeaveLife = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLeaveLife"]); + // //oSub.HUseLife = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HUseLife"]); + // //oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]); + // //oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]); + // //oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]); + // //oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]); + // //oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]); + // oSub2.HMaintainItemID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HMaintainItemID"]); + // oSub2.HMaintainItem = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HMaintainItem"]); + // oSub2.HMaintainPart = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HMaintainPart"]); + // oSub2.HClaim = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HClaim"]); + // oSub2.HManagerID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HManagerID"]); + // //oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]); + // //oSub.HBadCount = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HBadCount"]); + // //oSub.HWasterQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HWasterQty"]); + // //oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]); + // //oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]); + // //oSub.HSeOrderBillNo = DsSub.Tables[0].Rows[i]["HSeOrderBillNo"].ToString().Trim(); + + // DetailColl1.Add(oSub2); + //} + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + + //瀹℃牳 + public bool CheckBill(Int64 lngBillKey, ref string sReturn) + { + + try + { + string HChecker = DBUtility.ClsPub.CurUserName; + string HCheckDate = DBUtility.ClsPub.GetServerDate(-1); + oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString()); + //鐢熸垚璋冩嫧鍗� + //寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙� + + oCn.RunProc("exec h_p_QC_NoPassProdCheckBill_Check " + lngBillKey.ToString() ); + // + sReturn = ""; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + + //鍙嶅鏍� + public bool AbandonCheck(Int64 lngBillKey, ref string sReturn) + { + + try + { + string HChecker = DBUtility.ClsPub.CurUserName; + string HCheckDate = DBUtility.ClsPub.GetServerDate(-1); + oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null Where HInterID=" + lngBillKey.ToString()); + //鐢熸垚璋冩嫧鍗� + //寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙� + + oCn.RunProc("exec h_p_QC_NoPassProdCheckBill_AbandonCheck " + lngBillKey.ToString()); + // + sReturn = ""; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + //鍙嶅鏍稿墠鍒ゆ柇鍚庨潰宸ュ簭鏄惁宸茬粡杩涚珯 + public bool UnCheck(long HInterID, ref string sReturn) + { + DataSet Ds; + Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_UnCheck " + HInterID, "h_p_QC_NoPassProdCheckBill_UnCheck"); + if (Ds == null) + { + sReturn = "鍒ゆ柇涓嬮亾宸ュ簭鏄惁宸茬粡杩涚珯鏃跺嚭閿欙紒"; + return false; + } + if (Ds.Tables[0].Rows.Count > 0) + { + sReturn = "涓嬮亾宸ュ簭宸茬粡杩涚珯鎵弿锛屼笉鍏佽鍙嶅鏍革紒"; + return false; + } + return true; + + } + + + + } +} diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index 3d09c9d..5ad79a7 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -164,10 +164,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>04/16/2021 21:27:05</publishTime> + <publishTime>04/17/2021 15:45:52</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>04/16/2021 21:27:05</publishTime> + <publishTime>04/17/2021 15:45:52</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -341,7 +341,7 @@ <publishTime>03/26/2021 14:35:48</publishTime> </File> <File Include="Web.config"> - <publishTime>04/16/2021 21:27:14</publishTime> + <publishTime>04/17/2021 15:45:56</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 4cf5f75..a33bc7c 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -345,6 +345,7 @@ <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> + <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" /> <Compile Include="DLL\ClsSc_ProcessReport.cs" /> <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> -- Gitblit v1.9.1