From 7eb2427db47b9cd9413a3ef51afd34658ed71c3d Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期三, 26 三月 2025 10:58:25 +0800 Subject: [PATCH] 销售核销 --- WebAPI/Controllers/CGGL/Cg_ContractBillController.cs | 978 +++++++++++++++++++++++++++------------------------------ 1 files changed, 468 insertions(+), 510 deletions(-) diff --git a/WebAPI/Controllers/CGGL/Cg_ContractBillController.cs b/WebAPI/Controllers/CGGL/Cg_ContractBillController.cs index 18a4183..608ac7e 100644 --- a/WebAPI/Controllers/CGGL/Cg_ContractBillController.cs +++ b/WebAPI/Controllers/CGGL/Cg_ContractBillController.cs @@ -25,12 +25,7 @@ - #region 鍩虹鍒楄〃鏌ヨ - /// <summary> - /// 杩斿洖閲囪喘璁㈠崟鍒楄〃 - ///鍙傛暟锛歴tring sql銆� - ///杩斿洖鍊硷細object銆� - /// </summary> + #region 鑾峰彇鍚堝悓鍒楄〃 [Route("Cg_ContractBill/list")] [HttpGet] public object list(string sWhere, string user) @@ -44,29 +39,29 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡鐪嬫潈闄�"; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; objJsonResult.data = null; return objJsonResult; } - //string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 "; + string sql = "select * from h_v_Cg_ContractBillAllList where 1 = 1 "; - //if (sWhere=="" || sWhere == null) - //{ - // ds = oCN.RunProcReturn(sql+ " order by hmainid desc", "h_v_IF_POOrderBillList"); - //} - //else - //{ - // ds = oCN.RunProcReturn(sql + sWhere+ " order by hmainid desc", "h_v_IF_POOrderBillList"); - //} + if (sWhere == "" || sWhere == null) + { + ds = oCN.RunProcReturn(sql + " order by hmainid desc", "h_v_Cg_ContractBillAllList"); + } + else + { + ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Cg_ContractBillAllList"); + } //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛� - //bool isCgjl = Security_Log("Cg_ContractBill_PurchasManager", 1, true, user); + //bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user); //if (!isCgjl) //{ // sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0 )"; //} - string sql = "select * from h_v_Cg_ContractBillList where 1 = 1 " + sWhere; - ds = oCN.RunProcReturn(sql, "h_v_Cg_ContractBillList"); + //string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere; + //ds = oCN.RunProcReturn(sql, "h_v_Cg_ContractBillList"); foreach (DataColumn col in ds.Tables[0].Columns) { @@ -91,12 +86,13 @@ return objJsonResult; } } + #endregion - #region 閲囪喘璁㈠崟 淇濆瓨/缂栬緫鍔熻兘 + #region 閲囪喘鍚堝悓 淇濆瓨/缂栬緫鍔熻兘 [Route("Cg_ContractBill/ContractBillEdit")] [HttpPost] - public object POOrderBillEdit([FromBody] JObject sMainSub) + public object ContractBillEdit([FromBody] JObject sMainSub) { try { @@ -132,7 +128,9 @@ return objJsonResult; } } - + /// <summary> + /// 鏂板涓庢洿鏂板悎鍚� + /// </summary> public json AddBillMain(string msg1) { string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); @@ -182,14 +180,24 @@ string HUpDateDate = mainList2[0].HUpDateDate == null ? "''" : mainList2[0].HUpDateDate; string HDeleteDate = mainList2[0].HDeleteDate == null ? "''" : mainList2[0].HDeleteDate; - ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_POOrderBillList"); + + //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 + string s = ""; + int sYear = 0; + int sPeriod = 0; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.Message = s; + return objJsonResult; + } + + ds = oCN.RunProcReturn("select * from h_v_Cg_ContractBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Cg_ContractBillList"); if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板 { - //淇濆瓨鍓嶆帶鍒�========================================= + //淇濆瓨鍓嶆帶鍒�========================================= ds = oCN.RunProcReturn("exec h_p_Cg_ContractBill_BeforeSaveCtrl " + HInterID, "h_p_Cg_ContractBill_BeforeSaveCtrl "); - if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -218,27 +226,36 @@ //涓昏〃 oCN.RunProc(@"Insert Into Cg_ContractBillMain (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus - ,HAddress,HSSID,HSSDate,HPSStyleID,HSupID,HCurID - ,HExRate,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo + ,HRemark,HPrintQty ,HMaker,HMakeDate - ,HERPInterID,HERPBillType,HPURCHASEORGID - ,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID - ,HWHID,HProjectID) - values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" + - 1102 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress + - "'," + HSSID + ",'" + HSSDate + "'," + HPSStyleID + "," + HSupID + "," + HCurID + - "," + HExRate + "," + HEmpID + "," + HManagerID + "," + HDeptID + ",'" + HExplanation + "','" + HRemark + "','" + HInnerBillNo + "','" + HMaker + "',getdate()" + "," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + "," + HPURCHASERGROUPID + "," - + HPROVIDERID + "," + HSETTLEID + "," + HCHARGEID + ",'" + HBUSINESSTYPE + "','" + HPROVIDERADDRESS + "'," - + HCORRESPONDORGID + "," + HPROVIDERCONTACTID + "," - + HWHID + "," + HProjectID + ")"); - } //TODO閲囪喘鍚堝悓淇濆瓨瀛樺偍杩囩▼涓鸿В鍐� + ,HContractDate,HContractName,HAddress,HSSID,HSupID,HCurID,HExRate,HEmpID,HDeptID,HExplanation,HInnerBillNo + ) + values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1100 + "','" + + 1100 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + + HRemark + "'," + 0 + ",'"+ + HMaker + "',getdate(),'" + + HContractDate + "','" + HContractName + "','" + HAddress + "'," + HSSID + "," + HSupID + "," + HCurID + "," + HExRate + "," + HEmpID + "," + HDeptID + ",'" + HExplanation + "','" + HInnerBillNo + "'"+ + ")"); + } else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0) - { //淇敼 + { + //淇敼 + DataSet dss; + dss = oCN.RunProcReturn("select * from h_v_Cg_ContractBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Cg_ContractBillList"); + //鍒ゆ柇鏄惁鍙紪杈� + if (dss.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "" && dss.Tables[0].Rows[0]["瀹℃牳浜�"] != null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�"; + objJsonResult.data = 1; + return objJsonResult; + } oCN.RunProc("update Cg_ContractBillMain set " + "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HSSID=" + HSSID + ",HSupID=" + HSupID + ",HCurID=" + HCurID + ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HDeptID=" + HDeptID - + ",HAddress='" + HAddress + ",HContractName='" + HContractName + "',HContractDate='"+ HContractDate + + ",HAddress='" + HAddress + "',HContractName='" + HContractName + "',HContractDate= '"+ HContractDate + "' where HInterID=" + HInterID); //鍒犻櫎瀛愯〃 @@ -246,7 +263,7 @@ oCN.RunProc("delete from Cg_ContractBillScheme where HInterID='" + HInterID + "'"); } //淇濆瓨瀛愯〃 - objJsonResult = AddBillSub(msg3, HInterID, OperationType); + objJsonResult = AddBillSubAndScheme(msg3,msg4,HInterID,HBillNo,OperationType); if (objJsonResult.code == "0") { @@ -272,41 +289,25 @@ return objJsonResult; } } - - public json AddBillSub(string msg3, long HInterID, int OperationType) + /// <summary> + /// 淇濆瓨椤电 + /// </summary> + /// <param name="msg3">鐗╂枡鏄庣粏</param> + /// <param name="msg4">浠樻璁″垝</param> + /// <param name="HInterID">鍗曟嵁鍐呯爜</param> + /// <param name="OperationType"></param> + /// <param name="HBillNo">鍗曟嵁鍙�</param> + /// <returns></returns> + public json AddBillSubAndScheme(string msg3,string msg4, long HInterID,string HBillNo,int OperationType) { List<ClsCg_ContractBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_ContractBillSub>>(msg3); - List<ClsCg_ContractBillSub> DetailColl2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_ContractBillSub>>(msg3); - - Int64 HMaterID; - Int64 HUnitID; - double HQty; - double HPrice; - double HMoney; - double HTaxRate; - double HTaxMoney; - double HlineTotal; - - - - string HSourceBillNo = DetailColl2[0].HSourceBillNo == null ? "''" : DetailColl2[0].HSourceBillNo; - string HSourceBillType = DetailColl2[0].HSourceBillType == null ? "''" : DetailColl2[0].HSourceBillType; - double HRelationQty = DetailColl2[0].HRelationQty == null ? 0 : DetailColl2[0].HRelationQty; - - - - string HRemark = DetailColl2[0].HRemark == null ? "''" : DetailColl2[0].HRemark; - - - - - + List<ClsCg_ContractBillScheme> SchemeColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_ContractBillScheme>>(msg4); int i = 0; foreach (ClsCg_ContractBillSub oSub in DetailColl) { i++; - if (oSub.HQty <= 0 || oSub.HQty == null) + if (oSub.HQty <= 0 || oSub.HQty == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -352,22 +353,34 @@ } oCN.RunProc($@"Insert into Cg_ContractBillSub - (HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HDiscountRate,HRelTaxPrice - ,HMoney,HTaxRate,HTaxMoney,HLineTotal,HlineTotalBB,HDate,HInStockQty,HInvoiceQty,HSeOrderBillNo,HSeOrderInterID - ,HSeOrderEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo - ,HSourceBillType,HRelationQty,HBackRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo - ,HERPInterID,HERPEntryID,HSTOCKORGID - ,HSEQ,HRECEIVEDEPTID,HSUPPLIERLOT,HBOMID,HSTOCKUNITID,HBASEUNITID,HBFLOWID,HGIVEAWAY,HROWTYPE,HBASEUNITQTY,HSTOCKBASEQTY - ,HREQTRACENO,HTAXNETPRICE,HPRICECOEFFICIENT,HTAXCOMBINATION,HPRICEUNITID,HPRICELISTENTRY,HPAYORGID,HSETTLEMODEID,HSETTLECURRID - ,HEXCHANGETYPEID,HPAYCONDITIONID,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT - ,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HMATERIALDESC,HWHID) - values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID},{(oSub.HQty == null ? 0 : oSub.HQty)} - ,{oSub.HPrice},{oSub.HTaxPrice},{oSub.HDiscountRate},{oSub.HRelTaxPrice},{oSub.HMoney},{oSub.HTaxRate},{oSub.HTaxMoney},{oSub.HlineTotal},{oSub.HlineTotalBB},'{oSub.HDate}',{oSub.HInStockQty},{oSub.HInvoiceQty},{HSeOrderBillNo},{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{HRemark}',{HSourceInterID},{HSourceEntryID},{HSourceBillNo},{HSourceBillType},{HRelationQty},{HBackRelationQty},{HPropertyID},{HBatChNo}, - {HAuxPropID},{HMTONo},{HERPInterID},{HERPEntryID},{HSTOCKORGID},{HSEQ},{HRECEIVEDEPTID},'{HSUPPLIERLOT}',{HBOMID},{HSTOCKUNITID},{HBASEUNITID},'{HBFLOWID}',{HGIVEAWAY},{HROWTYPE},{HBASEUNITQTY},{HSTOCKBASEQTY},'{HREQTRACENO}',{HTAXNETPRICE},{HPRICECOEFFICIENT},{HTAXCOMBINATION},{HPRICEUNITID},{HPRICELISTENTRY},{HPAYORGID},{HSETTLEMODEID},{HSETTLECURRID},{HEXCHANGETYPEID},{HPAYCONDITIONID},{HEXCHANGERATE},{HLOCALCURRID},{HISINCLUDEDTAX},{HISPRICEEXCLUDETAX},{HTAXRATEID},{HCOSTPERCENT},{HCOSTAMOUNT},{HVAT},{HSELLERWITHHOLDING},{HBUYERWITHHOLDING},'{HMATERIALDESC}',{HWHID})"); + (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney, + HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxRate,HTaxMoney,HlineTotal + ) + values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney} + ,{oSub.HMaterID},{oSub.HUnitID},{oSub.HQty},{oSub.HPrice},{oSub.HMoney},{oSub.HTaxRate},{oSub.HTaxMoney},{oSub.HPrice})"); } + i=0; + //浠樻璁″垝淇濆瓨 + foreach (ClsCg_ContractBillScheme oSub in SchemeColl) + { + i++; + DataSet Cs; + Int64 NewHEntryID = 1; + Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Cg_ContractBillScheme", "Cg_ContractBillScheme"); + if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0) + { + NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()); + NewHEntryID += 1; + } + oCN.RunProc($@"Insert into Cg_ContractBillScheme + (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney, + HDate,HMoney,HCurID,HExRate) + values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney} + ,'{oSub.HDate}',{oSub.HMoney},{oSub.HCurID},{oSub.HExRate})"); + } //淇濆瓨鍚庢帶鍒�========================================= - ds = oCN.RunProcReturn("exec h_p_Cg_ContractBill_AfterSaveCtrl " + HInterID, "h_p_Cg_ContractBill_AfterSaveCtrl"); + ds = oCN.RunProcReturn("exec h_p_Cg_ContractBill_AfterSaveCtrl " + HInterID, "h_p_Cg_POOrderBill_AfterSaveCtrl"); if (ds == null || ds.Tables[0].Rows.Count == 0) { @@ -386,95 +399,15 @@ return objJsonResult; } //========================================================= - objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = null; objJsonResult.data = null; return objJsonResult; } - - - [Route("Cg_ContractBill/Cg_ContractBillSaveApi")] - [HttpPost] - public object Cg_ContractBillSaveApi([FromBody] JObject sMainSub) - { - try - { - LogService.Write("閲囪喘璁㈠崟鍚屾,淇濆瓨鏂规硶鎵ц瀹屾垚寮傚父锛�" + sMainSub.ToString()); - var model = sMainSub["model"].ToString(); - var entry = sMainSub["model"]["HENTRY"].ToString(); - - model = "[" + model.ToString() + "]"; - List<ClsCg_ContractBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_ContractBillMain>>(model); - List<ClsCg_ContractBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_ContractBillSub>>(entry); - string sql = string.Empty; - oCN.BeginTran(); - sql = $"delete Cg_ContractBillMain where HinterID = {mainList[0].HInterID}"; - oCN.RunProc(sql); - sql = $"delete Cg_ContractBillSub where HinterID = {mainList[0].HInterID}"; - oCN.RunProc(sql); - //涓昏〃 - oCN.RunProc(@"Insert Into Cg_ContractBillMain - (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus - ,HAddress,HSSID,HSSDate,HPSStyleID,HSupID,HSupDealerID,HCurID - ,HExRate,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo - ,HChecker,HCheckDate,HMaker,HMakeDate - ,HERPInterID,HERPBillType,HPURCHASEORGID - ,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID) - values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" + - mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "','" + mainList[0].HAddress + - "'," + mainList[0].HSSID + ",'" + mainList[0].HSSDate + "'," + mainList[0].HPSStyleID + "," + (mainList[0].HSupDealerID == 0 ? mainList[0].HSupID : mainList[0].HSupDealerID) + "," + mainList[0].HSupID + "," + mainList[0].HCurID + - "," + mainList[0].HExRate + "," + mainList[0].HEmpID + "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HExplanation + "','" + mainList[0].HRemark + "','" + mainList[0].HInnerBillNo + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HMaker + "','" + - mainList[0].HMakeDate + "'," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPURCHASEORGID + "," + mainList[0].HPURCHASERGROUPID + "," - + mainList[0].HPROVIDERID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HPROVIDERADDRESS + "'," - + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + ")"); - //淇濆瓨涓昏〃 - foreach (var oSub in subList) - { - sql = $@" - Insert into Cg_ContractBillSub - (HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HTaxRate_TAX,HTaxMoney_TAX,HTaxPrice,HDiscountRate,HRelTaxPrice - ,HMoney,HTaxRate,HTaxMoney,HLineTotal,HlineTotalBB,HDate,HInStockQty,HInvoiceQty,HSeOrderBillNo,HSeOrderInterID - ,HSeOrderEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo - ,HSourceBillType,HRelationQty,HBackRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo - ,HERPInterID,HERPEntryID,HSTOCKORGID - ,HSEQ,HRECEIVEDEPTID,HSUPPLIERLOT,HBOMID,HSTOCKUNITID,HBASEUNITID,HBFLOWID,HGIVEAWAY,HROWTYPE,HBASEUNITQTY,HSTOCKBASEQTY - ,HREQTRACENO,HTAXNETPRICE,HPRICECOEFFICIENT,HTAXCOMBINATION,HPRICEUNITID,HPRICELISTENTRY,HPAYORGID,HSETTLEMODEID,HSETTLECURRID - ,HEXCHANGETYPEID,HPAYCONDITIONID,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT - ,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HMATERIALDESC) - values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}','{oSub.HPrice}','{oSub.HTaxRate_TAX}','{oSub.HTaxMoney_TAX}','{oSub.HDiscountRate}','{oSub.HRelTaxPrice}', - '{oSub.HMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney}','{oSub.HlineTotal}','{oSub.HlineTotalBB}','{oSub.HDate}','{oSub.HInStockQty}','{oSub.HInvoiceQty}','{oSub.HSeOrderBillNo}','{oSub.HSeOrderInterID}', - '{oSub.HSeOrderEntryID}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}', - '{oSub.HSourceBillType}','{oSub.HRelationQty}','{oSub.HBackRelationQty}','{oSub.HPropertyID}','{oSub.HBatChNo}','{oSub.HAuxPropID}','{oSub.HMTONo}', - '{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HSTOCKORGID}', - '{oSub.HSEQ}','{oSub.HRECEIVEDEPTID}','{oSub.HSUPPLIERLOT}','{oSub.HBOMID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HBFLOWID}','{oSub.HGIVEAWAY}','{oSub.HROWTYPE}','{oSub.HBASEUNITQTY}','{oSub.HSTOCKBASEQTY}', - '{oSub.HREQTRACENO}','{oSub.HTAXNETPRICE}','{oSub.HPRICECOEFFICIENT}','{oSub.HTAXCOMBINATION}','{oSub.HPRICEUNITID}','{oSub.HPRICELISTENTRY}','{oSub.HPAYORGID}','{oSub.HSETTLEMODEID}','{oSub.HSETTLECURRID}', - '{oSub.HEXCHANGETYPEID}','{oSub.HPAYCONDITIONID}','{oSub.HEXCHANGERATE}','{oSub.HLOCALCURRID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HCOSTAMOUNT}', - '{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HMATERIALDESC}')"; - oCN.RunProc(sql); - } - oCN.Commit(); - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�"; - objJsonResult.data = null; - return objJsonResult; - - } - catch (Exception e) - { - LogService.Write("閲囪喘璁㈠崟鍚屾寮傚父,淇濆瓨鏂规硶鎵ц瀹屾垚寮傚父锛�" + e.Message.ToString()); - - oCN.RollBack(); - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); - objJsonResult.data = null; - return objJsonResult; - } - } #endregion + + #region 鍒犻櫎 /// <summary> ///鍒犻櫎鍔熻兘 /// </summary> @@ -508,14 +441,24 @@ return objJsonResult; } //================================================================================== - + //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 + string s = ""; + int sYear = 0; + int sPeriod = 0; + DateTime HDate = DateTime.Now; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.Message = s; + return objJsonResult; + } string sReturn = ""; oCN.BeginTran(); oCN.RunProc("Delete From Cg_ContractBillMain where HInterID = " + HInterID); oCN.RunProc("Delete From Cg_ContractBillSub where HInterID = " + HInterID); + oCN.RunProc("Delete From Cg_ContractBillScheme where HInterID = " + HInterID); oCN.Commit(); - //鍒犻櫎鍚庢帶鍒�================================================================================== + //鍒犻櫎鍚庢帶鍒�================================================================================== string sql2 = "exec h_p_Cg_ContractBill_AfterDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'"; ds = oCN.RunProcReturn(sql2, "h_p_Cg_ContractBill_AfterDelCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) @@ -556,7 +499,9 @@ return objJsonResult; } } + #endregion + #region 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍(鍔犺浇琛ㄧ敤) /// <summary> /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍 ///鍙傛暟锛歴tring sql銆� @@ -569,7 +514,7 @@ try { - ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID, "h_v_IF_POOrderBillList"); + ds = oCN.RunProcReturn("select * from h_v_Cg_ContractBillAllList where hmainid =" + HInterID, "h_v_Cg_ContractBillAllList"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -596,6 +541,7 @@ return objJsonResult; } } + #endregion #region 鏍规嵁鐗╂枡鍐呯爜鑾峰彇鐗╂枡淇℃伅 @@ -808,7 +754,6 @@ } #endregion - #region 閲囪喘璁㈠崟 鍏抽棴/鍙嶅叧闂姛鑳� [Route("Cg_ContractBill/CloseCg_ContractBill")] [HttpGet] @@ -956,19 +901,22 @@ } #endregion - #region 閲囪喘璁㈠崟 琛屽叧闂�/琛屽弽鍏抽棴 + #region 閲囪喘璁㈠崟 琛屽叧闂�/琛屽弽鍏抽棴锛堟湭瀹屽杽锛� /// <summary> /// </summary> /// <param name="HInterID">鍗曟嵁ID</param> + /// <param name="HEntryID2">瀛愬唴鐮佷粯娆捐鍒�</param> + /// <param name="HEntryID">瀛愬唴鐮佺墿鏂欐槑缁�</param> /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param> /// <param name="CurUserName">鍏抽棴浜�</param> /// <returns></returns> [Route("Cg_ContractBill/CloseRowCg_ContractBill")] [HttpGet] - public object CloseRowCg_ContractBill(int HInterID, int HEntryID, int IsAudit, string CurUserName) + public object CloseRowCg_ContractBill(int HInterID, int HEntryID,int HEntryID2, int IsAudit, string CurUserName) { string ModRightNameCheck = "Cg_ContractBill_Close"; - string SubBillName = "Cg_ContractBillSub"; //瀛愯〃琛ㄥ悕 + string SubBillName = "Cg_ContractBillSub"; + string SchemeBillName = "Cg_ContractBillScheme"; //瀛愯〃琛ㄥ悕 DBUtility.ClsPub.CurUserName = CurUserName; DataSet ds = null; try @@ -999,6 +947,7 @@ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔 if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁 { + //鍒ゆ柇鍗曟嵁鏉′欢 if (oBill.omodel.HDeleteMan.Trim() != "") { objJsonResult.code = "0"; @@ -1023,14 +972,14 @@ objJsonResult.data = null; return objJsonResult; } - + //鍒ゆ柇鐗╂枡鏄庣粏琛ㄦ潯浠� string sql = "select * from " + SubBillName + " where HInterID = " + HInterID + " and HEntryID = " + HEntryID; ds = oCN.RunProcReturn(sql, "Cg_ContractBillSub"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "璇ヨ鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.Message = "璇ョ墿鏂欒鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } @@ -1040,7 +989,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒"; + objJsonResult.Message = "鐗╂枡琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒"; objJsonResult.data = null; return objJsonResult; } @@ -1051,7 +1000,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�"; + objJsonResult.Message = "鐗╂枡琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1062,7 +1011,51 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�"; + objJsonResult.Message = "鐗╂枡琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + //鍒ゆ柇浠樻璁″垝琛ㄦ潯浠� + sql = "select * from " + SchemeBillName + " where HInterID = " + HInterID + " and HEntryID = " + HEntryID2; + ds = oCN.RunProcReturn(sql, "Cg_ContractBillScheme"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璇ヨ鍒掕鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + if (IsAudit == 0) //琛屽叧闂垽鏂� + { + if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璁″垝琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //琛屽弽鍏抽棴鍒ゆ柇 + { + if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璁″垝琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + //鍒ゆ柇琛屾槸鍚︿负鑷姩鍏抽棴 + string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString(); + if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璁″垝琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1077,12 +1070,12 @@ return objJsonResult; } - + oCN.BeginTran();//寮�鍚簨鍔� //杩涜闇�瑕佽繘琛岀殑琛屽叧闂�/琛屽弽鍏抽棴鎿嶄綔 if (IsAudit == 0) //琛屽叧闂彁浜� { //琛屽叧闂彁浜� - if (oBill.CloseRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + if (oBill.CloseRow(lngBillKey, HEntryID, HEntryID2, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) { objJsonResult.code = "1"; objJsonResult.count = 1; @@ -1102,7 +1095,7 @@ if (IsAudit == 1) //琛屽弽鍏抽棴鎻愪氦 { //琛屽弽鍏抽棴鎻愪氦 - if (oBill.CancelRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + if (oBill.CancelRow(lngBillKey, HEntryID, HEntryID2, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) { objJsonResult.code = "1"; objJsonResult.count = 1; @@ -1119,6 +1112,7 @@ return objJsonResult; } } + oCN.Commit(); return objJsonResult; } catch (Exception e) @@ -1262,355 +1256,319 @@ } #endregion - #region [鍚屾鍗曟嵁] - [Route("Cg_ContractBill/Cg_ContractBillViewApi")] - [HttpGet] - public json Cg_ContractBillViewApi(string BillNo, string BillType) - { - string sql = string.Empty; - string sReturn = ""; - if (oSystemParameter.ShowBill(ref sReturn) == true) - { - //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡 - if (oSystemParameter.omodel.WMS_CloudMode == "Y") - { - #region [绉佹湁浜戞ā寮忥紝鐩存帴璋冪敤鏁版嵁搴撳瓨鍌ㄨ繃绋嬫洿鏂癩 - try - { - oCN.BeginTran(); - SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); - DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + BillNo + "','" + BillType + "'", "h_p_WMS_ERPSourceBillToLocal"); - if (DS == null) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍗曟嵁鍚屾澶辫触"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2") - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "ERP涓笉瀛樺湪璇ュ崟鎹彿"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛"; - objJsonResult.data = null; - return objJsonResult; - } - } + #region [鍚屾鍗曟嵁鏈疄鐜帮紙宸叉敞閲婏級] + //[Route("Cg_ContractBill/Cg_ContractBillViewApi")] + //[HttpGet] + //public json Cg_ContractBillViewApi(string BillNo, string BillType) + //{ + // string sql = string.Empty; + // string sReturn = ""; + // if (oSystemParameter.ShowBill(ref sReturn) == true) + // { + // //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡 + // if (oSystemParameter.omodel.WMS_CloudMode == "Y") + // { + // #region [绉佹湁浜戞ā寮忥紝鐩存帴璋冪敤鏁版嵁搴撳瓨鍌ㄨ繃绋嬫洿鏂癩 + // try + // { + // oCN.BeginTran(); + // SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + // DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + BillNo + "','" + BillType + "'", "h_p_WMS_ERPSourceBillToLocal"); + // if (DS == null) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鍗曟嵁鍚屾澶辫触"; + // objJsonResult.data = null; + // return objJsonResult; + // } + // else + // { + // if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2") + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "ERP涓笉瀛樺湪璇ュ崟鎹彿"; + // objJsonResult.data = null; + // return objJsonResult; + // } + // else + // { + // objJsonResult.code = "1"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛"; + // objJsonResult.data = null; + // return objJsonResult; + // } + // } - } - catch (Exception e) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); - objJsonResult.data = null; - return objJsonResult; - } - #endregion - } - else - { - #region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩 - var json = new - { - CreateOrgId = 0, - Number = BillNo, - Id = "" - }; - #region [閲戣澏閮ㄥ垎] - //鐧诲綍閲戣澏 - var loginRet = InvokeHelper.Login(); - var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>(); - //鍒ゆ柇鏄惁鐧诲綍鎴愬姛 - if (isSuccess < 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = loginRet; - objJsonResult.data = null; - return objJsonResult; - } - //鏌ョ湅 鑾峰彇鏁版嵁 - var _result = InvokeHelper.View("PUR_PurchaseOrder", JsonConvert.SerializeObject(json)); - var _saveObj = JObject.Parse(_result); - //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛 - if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "閲戣澏閲囪喘璁㈠崟鍚屾澶辫触jsonRoot锛�" + _result; - objJsonResult.data = null; - return objJsonResult; - } + // } + // catch (Exception e) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "Exception锛�" + e.ToString(); + // objJsonResult.data = null; + // return objJsonResult; + // } + // #endregion + // } + // else + // { + // #region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩 + // var json = new + // { + // CreateOrgId = 0, + // Number = BillNo, + // Id = "" + // }; + // #region [閲戣澏閮ㄥ垎] + // //鐧诲綍閲戣澏 + // var loginRet = InvokeHelper.Login(); + // var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>(); + // //鍒ゆ柇鏄惁鐧诲綍鎴愬姛 + // if (isSuccess < 0) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = loginRet; + // objJsonResult.data = null; + // return objJsonResult; + // } + // //鏌ョ湅 鑾峰彇鏁版嵁 + // var _result = InvokeHelper.View("PUR_PurchaseOrder", JsonConvert.SerializeObject(json)); + // var _saveObj = JObject.Parse(_result); + // //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛 + // if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "閲戣澏閲囪喘璁㈠崟鍚屾澶辫触jsonRoot锛�" + _result; + // objJsonResult.data = null; + // return objJsonResult; + // } - #endregion - //鑾峰彇涓昏〃鏁版嵁 - DataSet Ds; - Int64 InterID = 0; - Ds = oCN.RunProcReturn("select * from Cg_ContractBillMain where HBillNo = '" + BillNo + "'", "Cg_ContractBillMain"); - if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0) - { - InterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()); - } + // #endregion + // //鑾峰彇涓昏〃鏁版嵁 + // DataSet Ds; + // Int64 InterID = 0; + // Ds = oCN.RunProcReturn("select * from Cg_ContractBillMain where HBillNo = '" + BillNo + "'", "Cg_ContractBillMain"); + // if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0) + // { + // InterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()); + // } - #region [涓昏〃鏁版嵁璧嬪�糫 - var jsonData = new - { - HInterID = _saveObj["Result"]["Result"]["Id"], - HYear = DateTime.Now.Year, - HPeriod = DateTime.Now.Month, - HBillType = 1102, - HBillSubType = 1102, - HDate = _saveObj["Result"]["Result"]["Date"], - HBillNo = _saveObj["Result"]["Result"]["BillNo"], - HBillStatus = _saveObj["Result"]["Result"]["ApproverId_Id"].ToString() == Convert.ToString(0) ? 1 : 2, - HAddress = "", - HSSID = 0, - HSSDate = _saveObj["Result"]["Result"]["Date"], - HPSStyleID = 0, - HSupID = _saveObj["Result"]["Result"]["SupplierId_Id"], - HCurID = 0, - HExRate = 0, - HEmpID = _saveObj["Result"]["Result"]["PurchaserId_Id"], - HManagerID = 0, - HDeptID = _saveObj["Result"]["Result"]["PurchaseDeptId_Id"], - HExplanation = "CLOUD瀵煎叆", - HRemark = "CLOUD瀵煎叆", - HInnerBillNo = _saveObj["Result"]["Result"]["BillNo"], - HChecker = _saveObj["Result"]["Result"]["ApproverId"]["Name"], - HCheckDate = _saveObj["Result"]["Result"]["ApproveDate"], - HMaker = _saveObj["Result"]["Result"]["CreatorId"]["Name"], - HMakeDate = _saveObj["Result"]["Result"]["CreateDate"], - HERPInterID = _saveObj["Result"]["Result"]["Id"], - HERPBillType = _saveObj["Result"]["Result"]["BillTypeId_Id"], - HPURCHASEORGID = _saveObj["Result"]["Result"]["PurchaseOrgId_Id"], - HPURCHASERGROUPID = _saveObj["Result"]["Result"]["PurchaserGroupId_Id"], - HPROVIDERID = _saveObj["Result"]["Result"]["ProviderId_Id"], - HSETTLEID = _saveObj["Result"]["Result"]["SettleId_Id"], - HCHARGEID = _saveObj["Result"]["Result"]["ChargeId_Id"], - HBUSINESSTYPE = _saveObj["Result"]["Result"]["BusinessType"], - HPROVIDERADDRESS = _saveObj["Result"]["Result"]["ProviderAddress"], - HCORRESPONDORGID = _saveObj["Result"]["Result"]["CorrespondOrgId_Id"], - HPROVIDERCONTACTID = _saveObj["Result"]["Result"]["ProviderContactId_Id"] - }; - #endregion - // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁 - sql = $"delete from Cg_ContractBillMain where HInterID = " + InterID; - oCN.RunProc(sql); + // #region [涓昏〃鏁版嵁璧嬪�糫 + // var jsonData = new + // { + // HInterID = _saveObj["Result"]["Result"]["Id"], + // HYear = DateTime.Now.Year, + // HPeriod = DateTime.Now.Month, + // HBillType = 1100, + // HBillSubType = 1100, + // HDate = _saveObj["Result"]["Result"]["Date"], + // HBillNo = _saveObj["Result"]["Result"]["BillNo"], + // HBillStatus = _saveObj["Result"]["Result"]["ApproverId_Id"].ToString() == Convert.ToString(0) ? 1 : 2, + // HAddress = "", + // HSSID = 0, + // HSSDate = _saveObj["Result"]["Result"]["Date"], + // HPSStyleID = 0, + // HSupID = _saveObj["Result"]["Result"]["SupplierId_Id"], + // HCurID = 0, + // HExRate = 0, + // HEmpID = _saveObj["Result"]["Result"]["PurchaserId_Id"], + // HManagerID = 0, + // HDeptID = _saveObj["Result"]["Result"]["PurchaseDeptId_Id"], + // HExplanation = "CLOUD瀵煎叆", + // HRemark = "CLOUD瀵煎叆", + // HInnerBillNo = _saveObj["Result"]["Result"]["BillNo"], + // HChecker = _saveObj["Result"]["Result"]["ApproverId"]["Name"], + // HCheckDate = _saveObj["Result"]["Result"]["ApproveDate"], + // HMaker = _saveObj["Result"]["Result"]["CreatorId"]["Name"], + // HMakeDate = _saveObj["Result"]["Result"]["CreateDate"], + // HERPInterID = _saveObj["Result"]["Result"]["Id"], + // HERPBillType = _saveObj["Result"]["Result"]["BillTypeId_Id"], + // HPURCHASEORGID = _saveObj["Result"]["Result"]["PurchaseOrgId_Id"], + // HPURCHASERGROUPID = _saveObj["Result"]["Result"]["PurchaserGroupId_Id"], + // HPROVIDERID = _saveObj["Result"]["Result"]["ProviderId_Id"], + // HSETTLEID = _saveObj["Result"]["Result"]["SettleId_Id"], + // HCHARGEID = _saveObj["Result"]["Result"]["ChargeId_Id"], + // HBUSINESSTYPE = _saveObj["Result"]["Result"]["BusinessType"], + // HPROVIDERADDRESS = _saveObj["Result"]["Result"]["ProviderAddress"], + // HCORRESPONDORGID = _saveObj["Result"]["Result"]["CorrespondOrgId_Id"], + // HPROVIDERCONTACTID = _saveObj["Result"]["Result"]["ProviderContactId_Id"] + // }; + // #endregion + // // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁 + // sql = $"delete from Cg_ContractBillMain where HInterID = " + InterID; + // oCN.RunProc(sql); - //鎻掑叆涓昏〃 - sql = $@" - insert into Cg_ContractBillMain - (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate - ,HBillNo,HBillStatus,HAddress,HSSID,HSSDate,HPSStyleID - ,HSupID,HCurID,HExRate,HEmpID,HManagerID,HDeptID - ,HExplanation,HRemark,HInnerBillNo - ,HChecker,HCheckDate,HMaker,HMakeDate - ,HERPInterID,HERPBillType,HPURCHASEORGID,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID - ,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID - ) - values - ({jsonData.HInterID},{jsonData.HYear},{jsonData.HPeriod},{jsonData.HBillType},{jsonData.HBillSubType}, - '{jsonData.HDate}','{jsonData.HBillNo}',{jsonData.HBillStatus},'{jsonData.HAddress}',{jsonData.HSSID}, - '{jsonData.HSSDate}',{jsonData.HPSStyleID},{jsonData.HSupID},{jsonData.HCurID},{jsonData.HExRate},{jsonData.HEmpID},{jsonData.HManagerID}, - {jsonData.HDeptID},'{jsonData.HExplanation}','{jsonData.HRemark}','{jsonData.HInnerBillNo}','{jsonData.HChecker}', - '{jsonData.HCheckDate}','{jsonData.HMaker}','{jsonData.HMakeDate}',{jsonData.HERPInterID},'{jsonData.HERPBillType}', - {jsonData.HPURCHASEORGID},{jsonData.HPURCHASERGROUPID},'{jsonData.HPROVIDERID}',{jsonData.HSETTLEID},{jsonData.HCHARGEID}, - '{jsonData.HBUSINESSTYPE}','{jsonData.HPROVIDERADDRESS}',{jsonData.HCORRESPONDORGID},{jsonData.HPROVIDERCONTACTID})"; + // //鎻掑叆涓昏〃 + // sql = $@" + // insert into Cg_ContractBillMain + // (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate + // ,HBillNo,HBillStatus,HAddress,HSSID,HSSDate,HPSStyleID + // ,HSupID,HCurID,HExRate,HEmpID,HManagerID,HDeptID + // ,HExplanation,HRemark,HInnerBillNo + // ,HChecker,HCheckDate,HMaker,HMakeDate + // ,HERPInterID,HERPBillType,HPURCHASEORGID,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID + // ,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID + // ) + // values + // ({jsonData.HInterID},{jsonData.HYear},{jsonData.HPeriod},{jsonData.HBillType},{jsonData.HBillSubType}, + // '{jsonData.HDate}','{jsonData.HBillNo}',{jsonData.HBillStatus},'{jsonData.HAddress}',{jsonData.HSSID}, + // '{jsonData.HSSDate}',{jsonData.HPSStyleID},{jsonData.HSupID},{jsonData.HCurID},{jsonData.HExRate},{jsonData.HEmpID},{jsonData.HManagerID}, + // {jsonData.HDeptID},'{jsonData.HExplanation}','{jsonData.HRemark}','{jsonData.HInnerBillNo}','{jsonData.HChecker}', + // '{jsonData.HCheckDate}','{jsonData.HMaker}','{jsonData.HMakeDate}',{jsonData.HERPInterID},'{jsonData.HERPBillType}', + // {jsonData.HPURCHASEORGID},{jsonData.HPURCHASERGROUPID},'{jsonData.HPROVIDERID}',{jsonData.HSETTLEID},{jsonData.HCHARGEID}, + // '{jsonData.HBUSINESSTYPE}','{jsonData.HPROVIDERADDRESS}',{jsonData.HCORRESPONDORGID},{jsonData.HPROVIDERCONTACTID})"; - oCN.RunProc(sql); + // oCN.RunProc(sql); - #region [鐢宠瀛愯〃鍙橀噺] - var dataArr = _saveObj["Result"]["Result"]["POOrderEntry"]; + // #region [鐢宠瀛愯〃鍙橀噺] + // var dataArr = _saveObj["Result"]["Result"]["POOrderEntry"]; - DataSet Cs; - double RelationQty = 0; - #endregion - int i = 0; + // DataSet Cs; + // double RelationQty = 0; + // #endregion + // int i = 0; - // 鑾峰彇瀛愯〃鏁版嵁 - Cs = oCN.RunProcReturn("select * from Cg_ContractBillSub where HInterID = " + InterID, "Cg_ContractBillSub"); - // 鍒犻櫎瀛愯〃瀵瑰簲鏁版嵁 - sql = $"delete from Cg_ContractBillSub where HInterID = " + InterID; - oCN.RunProc(sql); + // // 鑾峰彇瀛愯〃鏁版嵁 + // Cs = oCN.RunProcReturn("select * from Cg_ContractBillSub where HInterID = " + InterID, "Cg_ContractBillSub"); + // // 鍒犻櫎瀛愯〃瀵瑰簲鏁版嵁 + // sql = $"delete from Cg_ContractBillSub where HInterID = " + InterID; + // oCN.RunProc(sql); - foreach (var oSub in dataArr) - { - #region [瀛愯〃鏁版嵁璧嬪�糫 + // foreach (var oSub in dataArr) + // { + // #region [瀛愯〃鏁版嵁璧嬪�糫 - if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HInterID"].ToString()) != 0) - { - RelationQty = ClsPub.isDoule(Cs.Tables[0].Rows[i]["HRelationQty"].ToString()); + // if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HInterID"].ToString()) != 0) + // { + // RelationQty = ClsPub.isDoule(Cs.Tables[0].Rows[i]["HRelationQty"].ToString()); - i++; - } + // i++; + // } - var subData = new - { - HInterID = _saveObj["Result"]["Result"]["Id"], - HEntryID = oSub["Id"], - HMaterID = oSub["MaterialId_Id"], - HUnitID = oSub["UnitId_Id"], - HQty = oSub["Qty"], - HPrice = oSub["Price"], - HTaxRate_TAX = oSub["TaxRate"], - HTaxMoney_TAX = oSub["TaxAmount"], - HTaxPrice = oSub["TaxPrice"], - HDiscountRate = oSub["DiscountRate"], - HRelTaxPrice = 0, - HMoney = oSub["Amount"], - HTaxRate = oSub["TaxRate"], - HTaxMoney = oSub["TaxAmount"], - HLineTotal = 0, - HlineTotalBB = 0, - HDate = oSub["DeliveryDate"], - HInStockQty = 0, - HInvoiceQty = 0, - HRemark = oSub["Note"], - HSeOrderBillNo = "", - HSeOrderInterID = 0, - HSeOrderEntryID = 0, - HSourceInterID = 0, - HSourceEntryID = 0, - HSourceBillNo = "", - HSourceBillType = "", - HRelationQty = oSub["JOINQTY"], - HBackRelationQty = oSub["STOCKRETQTY"], - HPropertyID = 0, - HBatChNo = oSub["FLot_Text"], - HAuxPropID = oSub["AuxPropId_Id"], - HMTONo = oSub["MtoNo"], - HERPInterID = _saveObj["Result"]["Result"]["Id"], - HERPEntryID = oSub["Id"], - HSEQ = oSub["Seq"], - HRECEIVEDEPTID = oSub["ReceiveDeptId_Id"], - HSUPPLIERLOT = oSub["SupplierLot"], - HBOMID = oSub["BomId_Id"], - HSTOCKUNITID = oSub["StockUnitID_Id"], - HBASEUNITID = oSub["BaseUnitId_Id"], - HBFLOWID = oSub["FBFLowId_Id"], - HGIVEAWAY = oSub["GiveAway"], - HROWTYPE = oSub["RowType"], - HBASEUNITQTY = oSub["BaseUnitQty"], - HSTOCKBASEQTY = oSub["StockBaseQty"], - HREQTRACENO = oSub["ReqTraceNo"], - HMATERIALDESC = oSub["MultiLanguageText"][0]["MaterialDesc"], - HRECEIVEORGID = oSub["ReceiveOrgId_Id"], - HREQUIREORGID = oSub["RequireOrgId_Id"], - HTAXNETPRICE = oSub["TaxNetPrice"], - HPRICECOEFFICIENT = oSub["PriceCoefficient"], - HTAXCOMBINATION = oSub["FTaxCombination_Id"], - HPRICEUNITID = oSub["PriceUnitId_Id"], - HPRICELISTENTRY = oSub["PriceListEntry_Id"], - HPAYORGID = oSub["PayOrgId_Id"], - HSETTLEMODEID = oSub["EntrySettleModeId_Id"], - HSETTLECURRID = 0, - HEXCHANGETYPEID = 0, - HPAYCONDITIONID = 0, - HEXCHANGERATE = 0, - HLOCALCURRID = 0, - HISINCLUDEDTAX = 0, - HISPRICEEXCLUDETAX = 0, - HSETTLEORGID = oSub["SettleOrgId_Id"], - HTAXRATEID = oSub["POORDERENTRY_TAX"][0]["TaxRateId_Id"], - HCOSTPERCENT = oSub["POORDERENTRY_TAX"][0]["CostPercent"], - HCOSTAMOUNT = oSub["POORDERENTRY_TAX"][0]["CostAmount"], - HVAT = oSub["POORDERENTRY_TAX"][0]["VAT"], - HSELLERWITHHOLDING = oSub["POORDERENTRY_TAX"][0]["SellerWithholding"], - HBUYERWITHHOLDING = oSub["POORDERENTRY_TAX"][0]["BuyerWithholding"], - }; - #endregion + // var subData = new + // { + // HInterID = _saveObj["Result"]["Result"]["Id"], + // HEntryID = oSub["Id"], + // HMaterID = oSub["MaterialId_Id"], + // HUnitID = oSub["UnitId_Id"], + // HQty = oSub["Qty"], + // HPrice = oSub["Price"], + // HTaxRate_TAX = oSub["TaxRate"], + // HTaxMoney_TAX = oSub["TaxAmount"], + // HTaxPrice = oSub["TaxPrice"], + // HDiscountRate = oSub["DiscountRate"], + // HRelTaxPrice = 0, + // HMoney = oSub["Amount"], + // HTaxRate = oSub["TaxRate"], + // HTaxMoney = oSub["TaxAmount"], + // HLineTotal = 0, + // HlineTotalBB = 0, + // HDate = oSub["DeliveryDate"], + // HInStockQty = 0, + // HInvoiceQty = 0, + // HRemark = oSub["Note"], + // HSeOrderBillNo = "", + // HSeOrderInterID = 0, + // HSeOrderEntryID = 0, + // HSourceInterID = 0, + // HSourceEntryID = 0, + // HSourceBillNo = "", + // HSourceBillType = "", + // HRelationQty = oSub["JOINQTY"], + // HBackRelationQty = oSub["STOCKRETQTY"], + // HPropertyID = 0, + // HBatChNo = oSub["FLot_Text"], + // HAuxPropID = oSub["AuxPropId_Id"], + // HMTONo = oSub["MtoNo"], + // HERPInterID = _saveObj["Result"]["Result"]["Id"], + // HERPEntryID = oSub["Id"], + // HSEQ = oSub["Seq"], + // HRECEIVEDEPTID = oSub["ReceiveDeptId_Id"], + // HSUPPLIERLOT = oSub["SupplierLot"], + // HBOMID = oSub["BomId_Id"], + // HSTOCKUNITID = oSub["StockUnitID_Id"], + // HBASEUNITID = oSub["BaseUnitId_Id"], + // HBFLOWID = oSub["FBFLowId_Id"], + // HGIVEAWAY = oSub["GiveAway"], + // HROWTYPE = oSub["RowType"], + // HBASEUNITQTY = oSub["BaseUnitQty"], + // HSTOCKBASEQTY = oSub["StockBaseQty"], + // HREQTRACENO = oSub["ReqTraceNo"], + // HMATERIALDESC = oSub["MultiLanguageText"][0]["MaterialDesc"], + // HRECEIVEORGID = oSub["ReceiveOrgId_Id"], + // HREQUIREORGID = oSub["RequireOrgId_Id"], + // HTAXNETPRICE = oSub["TaxNetPrice"], + // HPRICECOEFFICIENT = oSub["PriceCoefficient"], + // HTAXCOMBINATION = oSub["FTaxCombination_Id"], + // HPRICEUNITID = oSub["PriceUnitId_Id"], + // HPRICELISTENTRY = oSub["PriceListEntry_Id"], + // HPAYORGID = oSub["PayOrgId_Id"], + // HSETTLEMODEID = oSub["EntrySettleModeId_Id"], + // HSETTLECURRID = 0, + // HEXCHANGETYPEID = 0, + // HPAYCONDITIONID = 0, + // HEXCHANGERATE = 0, + // HLOCALCURRID = 0, + // HISINCLUDEDTAX = 0, + // HISPRICEEXCLUDETAX = 0, + // HSETTLEORGID = oSub["SettleOrgId_Id"], + // HTAXRATEID = oSub["POORDERENTRY_TAX"][0]["TaxRateId_Id"], + // HCOSTPERCENT = oSub["POORDERENTRY_TAX"][0]["CostPercent"], + // HCOSTAMOUNT = oSub["POORDERENTRY_TAX"][0]["CostAmount"], + // HVAT = oSub["POORDERENTRY_TAX"][0]["VAT"], + // HSELLERWITHHOLDING = oSub["POORDERENTRY_TAX"][0]["SellerWithholding"], + // HBUYERWITHHOLDING = oSub["POORDERENTRY_TAX"][0]["BuyerWithholding"], + // }; + // #endregion - //鎻掑叆瀛愯〃 - sql = $@" - insert into Cg_ContractBillSub - (HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HTaxRate_TAX,HTaxMoney_TAX - ,HTaxPrice,HDiscountRate,HRelTaxPrice,HMoney,HTaxRate,HTaxMoney - ,HLineTotal,HlineTotalBB,HDate,HInStockQty,HInvoiceQty,HRemark - ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType - ,HRelationQty,HBackRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo - ,HERPInterID,HERPEntryID,HSEQ,HRECEIVEDEPTID,HSUPPLIERLOT,HBOMID - ,HSTOCKUNITID,HBASEUNITID,HBFLOWID,HGIVEAWAY,HROWTYPE,HBASEUNITQTY - ,HSTOCKBASEQTY,HREQTRACENO,HMATERIALDESC,HRECEIVEORGID,HREQUIREORGID - ,HTAXNETPRICE,HPRICECOEFFICIENT,HTAXCOMBINATION,HPRICEUNITID,HPRICELISTENTRY,HPAYORGID - ,HSETTLEMODEID,HSETTLECURRID,HEXCHANGETYPEID,HPAYCONDITIONID,HEXCHANGERATE,HLOCALCURRID - ,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HSETTLEORGID - ,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING - ) - values - ({subData.HInterID},{subData.HEntryID},{subData.HMaterID},{subData.HUnitID},{subData.HQty},{subData.HPrice}, - {subData.HTaxRate_TAX},{subData.HTaxMoney_TAX},{subData.HTaxPrice},{subData.HDiscountRate},{subData.HRelTaxPrice},{subData.HMoney},{subData.HTaxRate},{subData.HTaxMoney},{subData.HLineTotal},{subData.HlineTotalBB},'{subData.HDate}',{subData.HInStockQty},{subData.HInvoiceQty},'{subData.HRemark}','{subData.HSeOrderBillNo}',{subData.HSeOrderInterID},{subData.HSeOrderEntryID},{subData.HSourceInterID},{subData.HSourceEntryID},'{subData.HSourceBillNo}','{subData.HSourceBillType}',{subData.HRelationQty},{subData.HBackRelationQty},{subData.HPropertyID},'{subData.HBatChNo}',{subData.HAuxPropID},'{subData.HMTONo}',{subData.HERPInterID},{subData.HERPEntryID},{subData.HSEQ},{subData.HRECEIVEDEPTID},'{subData.HSUPPLIERLOT}',{subData.HBOMID},{subData.HSTOCKUNITID},{subData.HBASEUNITID},'{subData.HBFLOWID}','{subData.HGIVEAWAY}','{subData.HROWTYPE}',{subData.HBASEUNITQTY},{subData.HSTOCKBASEQTY},'{subData.HREQTRACENO}','{subData.HMATERIALDESC}',{subData.HRECEIVEORGID},{subData.HREQUIREORGID},{subData.HTAXNETPRICE},'{subData.HPRICECOEFFICIENT}','{subData.HTAXCOMBINATION}',{subData.HPRICEUNITID},'{subData.HPRICELISTENTRY}',{subData.HPAYORGID},{subData.HSETTLEMODEID},{subData.HSETTLECURRID},'{subData.HEXCHANGETYPEID}',{subData.HPAYCONDITIONID},{subData.HEXCHANGERATE},{subData.HLOCALCURRID},{subData.HISINCLUDEDTAX},{subData.HISPRICEEXCLUDETAX},{subData.HSETTLEORGID},{subData.HTAXRATEID},'{subData.HCOSTPERCENT}',{subData.HCOSTAMOUNT},'{subData.HVAT}','{subData.HSELLERWITHHOLDING}','{subData.HBUYERWITHHOLDING}')"; + // //鎻掑叆瀛愯〃 + // sql = $@" + // insert into Cg_ContractBillSub + // (HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HTaxRate_TAX,HTaxMoney_TAX + // ,HTaxPrice,HDiscountRate,HRelTaxPrice,HMoney,HTaxRate,HTaxMoney + // ,HLineTotal,HlineTotalBB,HDate,HInStockQty,HInvoiceQty,HRemark + // ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType + // ,HRelationQty,HBackRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo + // ,HERPInterID,HERPEntryID,HSEQ,HRECEIVEDEPTID,HSUPPLIERLOT,HBOMID + // ,HSTOCKUNITID,HBASEUNITID,HBFLOWID,HGIVEAWAY,HROWTYPE,HBASEUNITQTY + // ,HSTOCKBASEQTY,HREQTRACENO,HMATERIALDESC,HRECEIVEORGID,HREQUIREORGID + // ,HTAXNETPRICE,HPRICECOEFFICIENT,HTAXCOMBINATION,HPRICEUNITID,HPRICELISTENTRY,HPAYORGID + // ,HSETTLEMODEID,HSETTLECURRID,HEXCHANGETYPEID,HPAYCONDITIONID,HEXCHANGERATE,HLOCALCURRID + // ,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HSETTLEORGID + // ,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING + // ) + // values + // ({subData.HInterID},{subData.HEntryID},{subData.HMaterID},{subData.HUnitID},{subData.HQty},{subData.HPrice}, + // {subData.HTaxRate_TAX},{subData.HTaxMoney_TAX},{subData.HTaxPrice},{subData.HDiscountRate},{subData.HRelTaxPrice},{subData.HMoney},{subData.HTaxRate},{subData.HTaxMoney},{subData.HLineTotal},{subData.HlineTotalBB},'{subData.HDate}',{subData.HInStockQty},{subData.HInvoiceQty},'{subData.HRemark}','{subData.HSeOrderBillNo}',{subData.HSeOrderInterID},{subData.HSeOrderEntryID},{subData.HSourceInterID},{subData.HSourceEntryID},'{subData.HSourceBillNo}','{subData.HSourceBillType}',{subData.HRelationQty},{subData.HBackRelationQty},{subData.HPropertyID},'{subData.HBatChNo}',{subData.HAuxPropID},'{subData.HMTONo}',{subData.HERPInterID},{subData.HERPEntryID},{subData.HSEQ},{subData.HRECEIVEDEPTID},'{subData.HSUPPLIERLOT}',{subData.HBOMID},{subData.HSTOCKUNITID},{subData.HBASEUNITID},'{subData.HBFLOWID}','{subData.HGIVEAWAY}','{subData.HROWTYPE}',{subData.HBASEUNITQTY},{subData.HSTOCKBASEQTY},'{subData.HREQTRACENO}','{subData.HMATERIALDESC}',{subData.HRECEIVEORGID},{subData.HREQUIREORGID},{subData.HTAXNETPRICE},'{subData.HPRICECOEFFICIENT}','{subData.HTAXCOMBINATION}',{subData.HPRICEUNITID},'{subData.HPRICELISTENTRY}',{subData.HPAYORGID},{subData.HSETTLEMODEID},{subData.HSETTLECURRID},'{subData.HEXCHANGETYPEID}',{subData.HPAYCONDITIONID},{subData.HEXCHANGERATE},{subData.HLOCALCURRID},{subData.HISINCLUDEDTAX},{subData.HISPRICEEXCLUDETAX},{subData.HSETTLEORGID},{subData.HTAXRATEID},'{subData.HCOSTPERCENT}',{subData.HCOSTAMOUNT},'{subData.HVAT}','{subData.HSELLERWITHHOLDING}','{subData.HBUYERWITHHOLDING}')"; - oCN.RunProc(sql); - } + // oCN.RunProc(sql); + // } - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛锛�"; - objJsonResult.data = null; - return objJsonResult; + // objJsonResult.code = "1"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛锛�"; + // objJsonResult.data = null; + // return objJsonResult; - #endregion - } - } - else - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍗曟嵁璇诲彇澶辫触锛�"; - objJsonResult.data = null; - return objJsonResult; - } - } + // #endregion + // } + // } + // else + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鍗曟嵁璇诲彇澶辫触锛�"; + // objJsonResult.data = null; + // return objJsonResult; + // } + //} #endregion - #region 閲囪喘璁㈠崟 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栭噰璐鍗曟暟鎹� - [Route("Cg_ContractBill/loadCg_ContractBill_Push")] - [HttpGet] - public object loadCg_ContractBill_Push(long HInterID, long HSubID) - { - try - { - - ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_POOrderBillList"); - if (ds == null || ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏈煡璇㈠埌婧愬崟淇℃伅锛�"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; - } - } - catch (Exception e) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); - objJsonResult.data = null; - return objJsonResult; - } - } - #endregion } } -- Gitblit v1.9.1