From b097dfc5a8879c198f4f2f9c32b28cfe4c7fc829 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期日, 02 一月 2022 19:16:40 +0800 Subject: [PATCH] 新增了单据里面删除按钮方法 --- DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs | 14 ++++ WebAPI/WebServer.cs | 45 ++++++++++++++ WebAPI/Controllers/ProductInController.cs | 88 +++++++++++++++++++++++++++- 3 files changed, 141 insertions(+), 6 deletions(-) diff --git a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs index 938647e..433fb22 100644 --- a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs +++ b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs @@ -1045,6 +1045,20 @@ } } + //鍒犻櫎鍗曟嵁淇℃伅 + public bool DeleteBill(Int64 sHInterID,string HBillNo,string HBillType,string HBarCode) + { + try + { + oCn.RunProc("Delete from " + MvarItemKey + " where HInterID=" + sHInterID.ToString() + " and HBillNo='" + HBillNo.ToString() + "'and HBillType='" + HBillType + "'and HBarCode='" + HBarCode + "'", ref DBUtility.ClsPub.sExeReturnInfo); + return true; + } + catch (Exception e) + { + throw (e); + } + } + //鏂板 public bool AddNew_sQty_FIFO(string sQty, ref string sReturn) { diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs index 3269a5b..48559e9 100644 --- a/WebAPI/Controllers/ProductInController.cs +++ b/WebAPI/Controllers/ProductInController.cs @@ -284,6 +284,84 @@ /// <summary> + /// 缂栬緫椤甸潰杩斿洖浜у搧鍏ュ簱鏉$爜涓存椂琛ㄤ俊鎭� + /// </summary> + /// <returns></returns> + [Route("Web/GetHBarCodeShowBillSub")] + [HttpGet] + public object GetHBarCodeShowBillSub(long HInterID, long HMaterID, Int64 HAuxPropID, string HMTONo, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, string HBatchNo, Int64 HSourceInterID, Int64 HSourceEntryID, string sBillType, string sWhere) + { + try + { + ds = webserver.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere); + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + //鐐瑰嚮缂栬緫 鍏敤绐椾綋鍒犻櫎鏂规硶 + [Route("Kf_BarCodeEditDlg/DeltetBill")] + [HttpGet] + public object DeltetBill(long HInterID,string HBarCode,string HBillType) + { + string sErrMsg = string.Empty; + try + { + if (webserver.set_DelPonderationBillMain_Temp_BarCode(HInterID,HBarCode, HBillType, ref sErrMsg)) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎澶辫触锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + catch (Exception) + { + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎澶辫触锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + } + + + /// <summary> /// 杩斿洖浜у搧鍏ュ簱鎵爜鏄庣粏 /// </summary> /// <returns></returns> @@ -684,12 +762,12 @@ [Route("ProductIn/Delete_Json")] [HttpGet] - public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType) + public object Delete_Json(long HInterID,string HBillNo,string HBillType,string HBarCode) { string sErrMsg = string.Empty; try { - if (webserver.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg)) + if (webserver.DeleteBill(HInterID, HBillNo, HBillType, HBarCode, ref sErrMsg)) { objJsonResult.code = "0"; objJsonResult.count = 1; @@ -701,17 +779,17 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鍒犻櫎澶辫触锛�"; + objJsonResult.Message = "鍒犻櫎澶辫触锛�" ; objJsonResult.data = null; return objJsonResult; } } - catch (Exception) + catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鍒犻櫎澶辫触锛�"; + objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs index 196ef0d..e7cc53b 100644 --- a/WebAPI/WebServer.cs +++ b/WebAPI/WebServer.cs @@ -4048,6 +4048,22 @@ return false; } } + //鍒犻櫎鍗曟嵁涓存椂琛ㄤ俊鎭� + public bool DeleteBill(Int64 sHInterID,string HBillNo,string HBillType,string HBarCode, ref string sErrMsg) + { + DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl(); + if (dal.DeleteBill(sHInterID, HBillNo, HBillType, HBarCode)) + { + sErrMsg = "鍒犻櫎鎴愬姛锛�"; + return true; + } + else + { + sErrMsg = "鍒犻櫎澶辫触锛�"; + return false; + } + } + //public Model.ClsGy_BarCodeBill_WMS_Model_View get_InfoByBarCode_Source(string sBarCode, Int64 sInterID, ref bool sBool, ref string sErrMsg) //{ // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); @@ -4080,7 +4096,7 @@ // return null; // } //} - + #endregion #region 澶栬喘鍏ュ簱 @@ -7847,6 +7863,33 @@ } #endregion + //杩斿洖鏉$爜涓存椂琛� + /// <summary> + /// 杩斿洖鏉$爜涓存椂琛� + /// </summary> + public DataSet GetBarCode_Temp(long HInterID, long HMaterID, Int64 HAuxPropID, string HMTONo, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, string HBatchNo, Int64 HSourceInterID, Int64 HSourceEntryID, string sBillType, string sWhere) + { + DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View(); + return dal.GetBarCodeByID_View(HInterID, sBillType, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sWhere); + } + + //鍒犻櫎鍑哄叆搴撴潯鐮佷复鏃惰〃(鏍规嵁鏉$爜) + public bool set_DelPonderationBillMain_Temp_BarCode(long HInterID, string sBarCode, string sHBillType, ref string sErrMsg) + { + DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl(); + if (dal.DeleteByBarCode(HInterID, sBarCode, sHBillType)) + { + sErrMsg = "鍒犻櫎鎴愬姛锛�"; + return true; + } + else + { + sErrMsg = "鍒犻櫎澶辫触锛�"; + return false; + } + } + + /// <summary> /// 杩斿洖鎵爜鏄庣粏淇℃伅 /// </summary> -- Gitblit v1.9.1