From 76734ab6683a6f26ae9e853495c5cb82c3c70c3b Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期一, 27 十二月 2021 21:05:52 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/ProductInController.cs | 71 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) 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> -- Gitblit v1.9.1