From 4fd75e476900a304dbe4eb18b0afa2c810b2e0cc Mon Sep 17 00:00:00 2001 From: 陈雯静 <1134865194@qq.com> Date: 星期五, 15 三月 2024 16:23:11 +0800 Subject: [PATCH] 采购管理模块的修改与完善 --- WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 281 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 200 insertions(+), 81 deletions(-) diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs index 57bbbc4..9c69640 100644 --- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs +++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs @@ -22,11 +22,6 @@ public DataSet ds = new DataSet(); public object HRemark { get; private set; } - public object HSourceBillNo { get; private set; } - public object HSourceBillType { get; private set; } - public object HPOOrderBillNo { get; private set; } - public object HAuxPropID { get; private set; } - public object HBatchNO { get; private set; } public object HRelationQty { get; private set; } public object sql { get; private set; } public object oCn { get; private set; } @@ -148,7 +143,7 @@ long HWHID = mainList[0].HWHID;//浠撳簱 long HCurID = mainList[0].HCurID;//甯佸埆 long HManagerID = mainList[0].HManagerID;//涓荤 - long HSTOCKORGID = mainList[0].HSTOCKORGID;//搴撳瓨缁勭粐 + long HSTOCKORGID = mainList[0].HOrgID;//搴撳瓨缁勭粐 long HOWNERID = mainList[0].HOWNERID;//璐т富 long HSCWHID = mainList[0].HSCWHID;//璋冨嚭浠撳簱 long HSecManagerID = mainList[0].HSecManagerID;//楠屾敹 @@ -218,7 +213,7 @@ "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HSupID=" + HSupID + ",HCurID=" + HCurID + ",HSecManagerID=" + HSecManagerID + ", HSTOCKORGID=" + HSTOCKORGID + ",HKeeperID=" + HKeeperID + ",HWHID = " + HWHID + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID + ",HOWNERID=" + HOWNERID - + ",HAddress='" + HAddress + "'where HInterID=" + HInterID; + + ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "' where HInterID=" + HInterID; oCN.RunProc(sql); //鍒犻櫎瀛愯〃 @@ -226,6 +221,13 @@ } //淇濆瓨瀛愯〃 objJsonResult = AddBillSub(msg3, HInterID, OperationType, user); + + //閲囪喘鍏ュ簱鍗曟柊澧炲洖濉噰璐鍗曞叧鑱旀暟閲� + oCN.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPOStockIn_Add " + HInterID); + + //閲囪喘鍏ュ簱鍗曟柊澧炲洖濉敹鏂欓�氱煡鍗曞叧鑱旀暟閲� + oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockToPOStockIn_Add " + HInterID); + if (objJsonResult.code == "0") { @@ -378,57 +380,19 @@ return objJsonResult; } - /// <summary> ///鍒犻櫎鍔熻兘 /// </summary> /// <returns></returns> [Route("Kf_POStockInBill/DeltetKf_POStockInBill")] [HttpGet] - public object DeleteKf_POStockInBackBill(string Hmainid, string HsupId, string HQty, string HSourceInterID, string HSourceEntryID, string user) + public object DeltetKf_POStockInBill(string HInterID, string user) { - DataSet ds; - DataSet dss; - //string ModRightNameCheck = "Sc_ProcessReport_check"; try { - //鍒犻櫎鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBackBill_Drop", 1, false, user)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; - objJsonResult.data = null; - return objJsonResult; - } - - SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - if (string.IsNullOrWhiteSpace(Hmainid)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "Hmainid涓虹┖锛�"; - objJsonResult.data = null; - return objJsonResult; - } - string HBillNo = ""; - ds = oCN.RunProcReturn("select * from Kf_ICStockBillMain where HInterID=" + Hmainid, "Kf_ICStockBillMain "); - if (ds == null || ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒"; - objJsonResult.data = null; - return objJsonResult; ; - } - else - { - HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString(); - } - //鍒犻櫎鍓嶆帶鍒�========================================= - string sql1 = "exec h_p_Kf_POStockInBill_BeforeDelCtrl " + Hmainid + ",'" + HBillNo + "','" + user + "'"; + string sql1 = "exec h_p_Kf_POStockInBill_BeforeDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'"; ds = oCN.RunProcReturn(sql1, "h_p_Kf_POStockInBill_BeforeDelCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { @@ -449,36 +413,14 @@ } //================================================================================== - oCN.BeginTran();//寮�濮嬩簨鍔� - ds = oCN.RunProcReturn("select * from Kf_ICStockBillMain a inner join Kf_ICStockBillSub b on a.HInterID=b.HInterID where a.HInterID= '"+ Hmainid+"'", "Kf_ICStockBillMain"); - dss = oCN.RunProcReturn("exec h_p_Cg_POInStockBillMain_Delete " + HQty + ", '" + HSourceInterID + "', '" + HSourceEntryID + "','" + user + " '", "h_p_Cg_POInStockBillMain_Delete"); - var sReturn = ""; - if (DBUtility.ClsPub.isLong(dss.Tables[0].Rows[0]["HBack"]) != 0) - { - sReturn = DBUtility.ClsPub.isStrNull(dss.Tables[0].Rows[0]["HBackRemark"]).ToString(); - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = sReturn; - objJsonResult.data = null; - return objJsonResult; - } - - if (ds.Tables[0].Rows.Count == 1) - { - oCN.RunProc("delete Kf_ICStockBillSub where HInterID=" + Hmainid); - oCN.RunProc("delete Kf_ICStockBillMain where HInterID=" + Hmainid); - } - else - { - oCN.RunProc($"delete Kf_ICStockBillSub where HInterID={ Hmainid}and HEntryID={HsupId}"); - } - - - - oCN.Commit();//鎻愪氦浜嬪姟 + string sReturn = ""; + oCN.BeginTran(); + oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID); + oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID); + oCN.Commit(); //鍒犻櫎鍚庢帶鍒�================================================================================== - string sql2 = "exec h_p_Kf_POStockInBill_AfterDelCtrl " + Hmainid + ",'" + HBillNo + "','" + user + "'"; + string sql2 = "exec h_p_Kf_POStockInBill_AfterDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'"; ds = oCN.RunProcReturn(sql2, "h_p_Kf_POStockInBill_AfterDelCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { @@ -502,24 +444,25 @@ } //============================================================================================== - objJsonResult.code = "0"; + objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�"; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; objJsonResult.data = null; - return objJsonResult; ; - + return objJsonResult; } catch (Exception e) { + oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString(); + objJsonResult.Message = "Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } - + + /// <summary> /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍 ///鍙傛暟锛歴tring sql銆� @@ -918,6 +861,182 @@ #endregion + #region 閲囪喘鍏ュ簱鍗� 琛屽叧闂�/琛屽弽鍏抽棴 + /// <summary> + /// </summary> + /// <param name="HInterID">鍗曟嵁ID</param> + /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param> + /// <param name="CurUserName">鍏抽棴浜�</param> + /// <returns></returns> + [Route("Kf_POStockInBill/CloseRowKf_POStockInBill")] + [HttpGet] + public object CloseRowKf_POStockInBill(int HInterID, int HEntryID, int IsAudit, string CurUserName) + { + string ModRightNameCheck = "Kf_POStockInBill_Close"; + string SubBillName = "Kf_ICStockBillSub"; //瀛愯〃琛ㄥ悕 + DBUtility.ClsPub.CurUserName = CurUserName; + DataSet ds = null; + try + { + //妫�鏌ユ潈闄� + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "琛屽叧闂け璐ワ紒鏃犳潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + //HInterID鏁版嵁鍒ゆ柇 + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹� + DAL.ClsKf_POStockInBill oBill = new DAL.ClsKf_POStockInBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣� + + //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔 + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁 + { + if (oBill.omodel.HDeleteMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜琛屽叧闂紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.omodel.HCloseMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜琛屽叧闂紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.omodel.HChecker.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜琛屽叧闂紒"; + objJsonResult.data = null; + return objJsonResult; + } + + string sql = "select * from " + SubBillName + " where HInterID = " + HInterID + " and HEntryID = " + HEntryID; + ds = oCN.RunProcReturn(sql, "Kf_ICStockBillSub"); + 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; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + + + //杩涜闇�瑕佽繘琛岀殑琛屽叧闂�/琛屽弽鍏抽棴鎿嶄綔 + if (IsAudit == 0) //琛屽叧闂彁浜� + { + //琛屽叧闂彁浜� + if (oBill.CloseRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "琛屽叧闂垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "琛屽叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //琛屽弽鍏抽棴鎻愪氦 + { + //琛屽弽鍏抽棴鎻愪氦 + if (oBill.CancelRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅叧闂垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 閲囪喘鍏ュ簱鍗� 浣滃簾/鍙嶄綔搴熷姛鑳� [Route("Kf_POStockInBill/DropKf_POStockInBill")] [HttpGet] -- Gitblit v1.9.1