From 6b2c7a19f95349edd1de84e3a2d857403abc6e1b Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期二, 04 七月 2023 16:10:52 +0800 Subject: [PATCH] 新增从缓存列表页面返回信息调用方法 --- WebAPI/Controllers/OtherOutBillController.cs | 132 +++++++++++++++++++++++++++++-------------- 1 files changed, 88 insertions(+), 44 deletions(-) diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs index 18f4658..d635875 100644 --- a/WebAPI/Controllers/OtherOutBillController.cs +++ b/WebAPI/Controllers/OtherOutBillController.cs @@ -48,6 +48,7 @@ private JsonResult objJsonResult = new JsonResult(); public ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS(); SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}"; public static string GetSession(string sMsg) { @@ -68,53 +69,96 @@ /// <returns></returns> [Route("OtherOutBill/get_CheckTypeByBarCode_Out_Json")] [HttpGet] - public Object get_CheckTypeByBarCode_Out_Json(string sCode, Int64 sInterID,string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID, string HScanStyle) + //public Object get_CheckTypeByBarCode_Out_Json(string sCode, Int64 sInterID,string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID, string HScanStyle) + //{ + // //oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo); + // //if (oBar == null) + // //{ + // // 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 = "鎵爜鎴愬姛锛�"; + // // //objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + // // objJsonResult.data = oBar; + // // return objJsonResult; + // //} + + + // string sErrMsg = ""; + // string sJXCode = ""; + // if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤 + // { + // sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker); + // SourceFlag = true; + // } + // else + // { + // sJXCode = sCode; + // } + + + + // WebS.WebService1 oWebs = new WebS.WebService1(); + // WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); + // string sExpressNumber = ""; + // //var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); + // SourceFlag = true; + // //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); + // //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); + // WebSoBar = oWebs.get_CheckTypeByBarCode_New(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo); + // if (WebSoBar == null) + // { + // 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 = WebSoBar; + // return objJsonResult; + // } + //} + + + + + public object get_CheckTypeByBarCode_Out_Json(string sCode, long sInterID, string sBillNo, string sMaker, long WhID, long SPID, double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, long HOWNERID) { - //oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo); - //if (oBar == null) - //{ - // 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 = "鎵爜鎴愬姛锛�"; - // //objJsonResult.Message = DBUtility.ClsPub.sErrInfo; - // objJsonResult.data = oBar; - // return objJsonResult; - //} - - WebS.WebService1 oWebs = new WebS.WebService1(); - WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); - string sExpressNumber = ""; - - var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); - SourceFlag = true; - //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - WebSoBar = oWebs.get_CheckTypeByBarCode_New(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo); - if (WebSoBar == null) + WebAPI.WebS.ClsKf_ICStockBill_WMS clsKf_ICStockBill_WMS = new WebAPI.WebS.ClsKf_ICStockBill_WMS(); + string hexpressNumber = ""; + clsKf_ICStockBill_WMS = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, this.HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, hexpressNumber, ref ClsPub.sErrInfo); + bool flag = clsKf_ICStockBill_WMS == null; + object result; + if (flag) { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = DBUtility.ClsPub.sErrInfo; - objJsonResult.data = null; - return objJsonResult; + this.objJsonResult.code = "0"; + this.objJsonResult.count = 0; + this.objJsonResult.Message = ClsPub.sErrInfo; + this.objJsonResult.data = null; + result = this.objJsonResult; } else { - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = DBUtility.ClsPub.sErrInfo; - objJsonResult.data = WebSoBar; - return objJsonResult; + this.objJsonResult.code = "0"; + this.objJsonResult.count = 1; + this.objJsonResult.Message = ClsPub.sErrInfo; + this.objJsonResult.data = clsKf_ICStockBill_WMS; + result = this.objJsonResult; } + return result; } /// <summary> @@ -428,8 +472,8 @@ List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>(); ListModels oListModels = new ListModels(); lsmain = oListModels.getOtherOutBillMainByJson(msg1); - lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); - lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); + //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); string sSourceBillType = lsmain[0].HBillType; WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain(); @@ -450,7 +494,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 1; - objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛� objJsonResult.data = null; return objJsonResult; } @@ -458,7 +502,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛� objJsonResult.data = null; return objJsonResult; } -- Gitblit v1.9.1