From b0c699cb452fefdfd8e272d78c106b75504cdd38 Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期六, 25 十二月 2021 15:17:41 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs | 15 +++++ WebAPI/Controllers/MoveStockBillController.cs | 2 WebAPI/WebServer.cs | 9 +++ WebAPI/Controllers/WebAPIController.cs | 42 ++++++++++++++ WorkM/流转卡管理/MES_StationOutBill.cs | 2 WebAPI/Controllers/ProductInController.cs | 71 +++++++++++++++++++++++ 6 files changed, 139 insertions(+), 2 deletions(-) diff --git a/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs b/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs index 204ff44..3a02151 100644 --- a/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs +++ b/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs @@ -75,6 +75,21 @@ #endregion + //缂撳瓨鍒楄〃鐣岄潰锛岃繑鍥炵紦瀛樺垪琛ㄤ俊鎭� + public DataSet GetKf_PonderationBillMain_TempList_New(string sHBillType, string sHMaker, Int64 sHOWNERID) + { + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New '" + sHBillType + "','" + sHMaker + "'," + sHOWNERID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New"); + if (Ds == null || Ds.Tables[0].Rows.Count == 0) + { + return null; + } + else + { + return Ds; + } + } + public DataSet GetKf_ICStockBillList(string sHBillType, string sHMaker, Int64 sHOWNERID) { SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs index 03e7443..dae3db8 100644 --- a/WebAPI/Controllers/MoveStockBillController.cs +++ b/WebAPI/Controllers/MoveStockBillController.cs @@ -440,7 +440,7 @@ websLsmain.HSupID = 0; //websLsmain.HGroupID = lsmain[0].HGroupID; - if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo)) + if (webserver.set_SaveMoveStockBill(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo)) { objJsonResult.code = "0"; objJsonResult.count = 1; diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs index fc04bad..44f87b5 100644 --- a/WebAPI/Controllers/ProductInController.cs +++ b/WebAPI/Controllers/ProductInController.cs @@ -59,6 +59,37 @@ return ""; } } + + /// <summary> + /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃缂栬緫鍓嶅垽鏂崟鎹槸鍚﹀凡涓婁紶 鐩存帴璋僕ebService + /// </summary> + /// <returns></returns> + //[Route("ProductIn/ProductInTempList_Modify")] + //[HttpGet] + //public Object ProductInTempList_Modify(Int64 sInterID,string sBillNo, string sBillType) + //{ + + // //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo); + // WebS.WebService1 oWebs = new WebS.WebService1(); + // if (oWebs.TempList_Modify(sInterID, sBillNo, sBillType, ref sErrMsg)) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + // objJsonResult.data = null; + // return objJsonResult; + // } + // else + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + // objJsonResult.data = null; + // return objJsonResult; + // } + //} + + /// <summary> /// 浜у搧鍏ュ簱/鎵潯鐮�/鐩存帴璋冪敤webservice /// </summary> @@ -165,6 +196,46 @@ } } + ///// <summary> + ///// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅 + ///// </summary> + ///// <returns></returns> + //[Route("ProductIn/DisBillEntryList_Json1")] + //[HttpGet] + //public object DisBillEntryList_Json1(string HBillType,string sHMaker, Int64 HOrgID) + //{ + // try + // { + // ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID); + // 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; + // } + //} + /// <summary> diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index c4dec73..bab1e9c 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -2497,6 +2497,48 @@ } #endregion + + /// <summary> + /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅 + /// </summary> + /// <returns></returns> + [Route("Web/chanpinruk")] + [HttpGet] + public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID) + { + try + { + ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID); + 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; + } + } + + + } } diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs index b44ef78..3785002 100644 --- a/WebAPI/WebServer.cs +++ b/WebAPI/WebServer.cs @@ -4429,6 +4429,14 @@ //杩斿洖缂撳瓨鍒楄〃淇℃伅 鍚屾璧勬枡 + public DataSet GetKf_PonderationBillMain_TempList_New(string sHBillType, string sHMaker, Int64 sHOWNERID) + { + DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View(); + return dal.GetKf_PonderationBillMain_TempList_New(sHBillType, sHMaker, sHOWNERID); + } + + + //杩斿洖缂撳瓨鍒楄〃淇℃伅 鍚屾璧勬枡 public DataSet GetKf_PonderationBillMain_TempList(string sHBillType, string sWhere) { DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View(); @@ -4437,6 +4445,7 @@ + /// <summary> /// 鐢熸垚澶栬喘鍏ュ簱鍗� /// </summary> diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" index c699816..b51259a 100644 --- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" +++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" @@ -591,7 +591,7 @@ MessageBox.Show("宸ヤ綔涓績娌℃湁閫夋嫨锛�", "鎻愮ず"); return false; } - if (DBUtility.ClsPub.isDoule(txtHQty.Text) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text) <= 0) + if (DBUtility.ClsPub.isDoule(txtHQty.Text) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text) + DBUtility.ClsPub.isDoule(txtHBadCount.Text) <= 0) { MessageBox.Show("鏁伴噺涓嶈兘涓�0锛�", "鎻愮ず"); return false; -- Gitblit v1.9.1