From 586fa521b1cd274078932c7c3fb81233ae51f10d Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期五, 03 三月 2023 15:25:25 +0800 Subject: [PATCH] 新增了Webs调用地址 用于检验单上传 --- LMES/bin/x86/Debug.zip | 0 WebAPI/DLL/Newtonsoft.Json/Newtonsoft.Json.dll | 0 WebAPI/Properties/Settings.settings | 3 WebAPI/Web References/WebS/WebService1.wsdl | 4 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 255 ++-- WebAPI/Web References/WebS2/Reference.map | 7 WebAPI/Controllers/ProductInController.cs | 217 +++- WebAPI/Web References/WebS/Reference.map | 4 WebAPI/Controllers/POStockInBillController.cs | 879 ++++++++++++++---- WebAPI/Web References/WebS/WebService1.disco | 6 WebAPI/Controllers/MateOutController.cs | 23 WebAPI/Controllers/OtherOutBillController.cs | 123 + WebAPI/Controllers/SellOutController.cs | 29 WebAPI/Web.config | 10 WebAPI/Web References/WebS2/WebService1.wsdl | 179 +++ WebAPI/Web References/WebS2/Reference.cs | 412 +++++++++ WebAPI/Controllers/Sc_ProcessMangementController.cs | 496 ++++++---- WebAPI/DLL/Newtonsoft.Json.rar | 0 WebAPI/Properties/Settings.Designer.cs | 10 WebAPI/WebAPI.csproj | 31 WebAPI/Web References/WebS2/WebService1.disco | 6 21 files changed, 2,008 insertions(+), 686 deletions(-) diff --git a/LMES/bin/x86/Debug.zip b/LMES/bin/x86/Debug.zip new file mode 100644 index 0000000..9375961 --- /dev/null +++ b/LMES/bin/x86/Debug.zip Binary files differ diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs index 0b3be7d..75a4d57 100644 --- a/WebAPI/Controllers/MateOutController.cs +++ b/WebAPI/Controllers/MateOutController.cs @@ -49,7 +49,8 @@ public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); // private DataBaseServices objDataBaseServices = new DataBaseServices(); private json objJsonResult = new json(); - // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}"; + 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) { try @@ -652,9 +653,23 @@ [HttpGet] public Object get_CheckTypeByBarCode_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) { + try { - var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); + string sErrMsg = ""; + string sJXCode = ""; + if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤 + { + sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker); + SourceFlag = true; + } + else + { + sJXCode = sCode; + } + + + //var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); string sExpressNumber = ""; WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); @@ -866,8 +881,8 @@ objJsonResult.data = new { list = ds.Tables[0] - //, - //list2 = ds.Tables[5] + , + list2 = ds.Tables[5] }; return objJsonResult; } diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs index a6483f8..743c487 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,52 +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> diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs index 324bca1..0d614ab 100644 --- a/WebAPI/Controllers/POStockInBillController.cs +++ b/WebAPI/Controllers/POStockInBillController.cs @@ -78,49 +78,101 @@ /// <returns></returns> [Route("POStockInBill/get_CheckTypeByBarCode_Json")] [HttpGet] - public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string sBillNo, string sBillType, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID) + //public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string sBillNo, string sBillType, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID) + //{ + // try + // { + // string sErrMsg = ""; + // string sJXCode = ""; + // if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤 + // { + // sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker); + // SourceFlag = true; + // } + // else + // { + // sJXCode = sCode; + // } + + + + // //var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, HBillNo, sMaker); + // //if (sRedBlue == true) + // //{ + // // HBillType = "1239"; + // //} + // //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(); + // WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); + // string sExpressNumber = ""; + // WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); + // //WebSoBar = oWebs.get_ba(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, 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; + // } + // } + // catch (Exception e) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = e.Message + ";" + e.StackTrace; + // objJsonResult.data = null; + // return objJsonResult; + // } + + //} + + + public object get_CheckTypeByBarCode_Json(string sCode, long sInterID, string sBillNo, string sBillType, string sMaker, long WhID, long SPID, double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, long HOWNERID) { + object result; try { - var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, HBillNo, sMaker); - //if (sRedBlue == true) - //{ - // HBillType = "1239"; - //} - //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(); WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); - string sExpressNumber = ""; - WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - //WebSoBar = oWebs.get_ba(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - if (WebSoBar == null) + string hexpressNumber = ""; + WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, this.HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, hexpressNumber, ref ClsPub.sErrInfo); + bool flag = WebSoBar == null; + 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 = WebSoBar; + result = this.objJsonResult; } } - catch (Exception e) + catch (Exception ex) { - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = e.Message + ";" + e.StackTrace; - objJsonResult.data = null; - return objJsonResult; + this.objJsonResult.code = "0"; + this.objJsonResult.count = 1; + this.objJsonResult.Message = ex.Message + ";" + ex.StackTrace; + this.objJsonResult.data = null; + result = this.objJsonResult; } - + return result; } - @@ -939,13 +991,13 @@ bool flag3 = dataSet5.Tables[0].Rows.Count > 0; if (!flag3) { - //POStockInBillController postockInBillController = new POStockInBillController(); - //postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo); + POStockInBillController postockInBillController = new POStockInBillController(); + postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo); - WEBSController webscontroller4 = new WEBSController(); - object obj4 = webscontroller4.Get_SourceBarCode_PoStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID,1, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo); + //WEBSController webscontroller4 = new WEBSController(); + //object obj4 = webscontroller4.Get_SourceBarCode_PoStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID,1, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo); - + } } @@ -1632,7 +1684,8 @@ '@' }); string str14 = array3[0]; - long num61 = (long)ClsPub.isInt(array3[4]); + //long num61 = (long)ClsPub.isInt(array3[4]); + Double num61 = ClsPub.isDoule(array3[4]); string text46 = array3[6]; DateTime dateTime13 = ClsPub.isDate(array3[3]); DateTime dateTime14 = ClsPub.isDate(array3[5]); @@ -3051,7 +3104,7 @@ } } } - result = text; + result = text; } catch (Exception ex) { @@ -3916,6 +3969,70 @@ } + //[Route("POStockInBill/set_SavePOStockInBill_Json")] + //[HttpPost] + //public object set_SavePOStockInBill_Json([FromBody] JObject oMain) + //{ + // string text = oMain["oMain"].ToString(); + // string jsonString = text.ToString(); + // object result; + // try + // { + // List<ClsKf_POStockInBillMain> list = new List<ClsKf_POStockInBillMain>(); + // ListModels listModels = new ListModels(); + // list = listModels.getPOStockInBillMainByJson(jsonString); + // list[0].HYear = ClsPub.isLong(DateTime.Now.Year); + // list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); + // string hbillType = list[0].HBillType; + // WebAPI.WebS.ClsKf_POStockInBillMain clsKf_POStockInBillMain = new WebAPI.WebS.ClsKf_POStockInBillMain(); + // clsKf_POStockInBillMain.HInterID = list[0].HInterID; + // clsKf_POStockInBillMain.HBillNo = list[0].HBillNo; + // clsKf_POStockInBillMain.HBillType = "1201"; + // clsKf_POStockInBillMain.HDate = list[0].HDate; + // clsKf_POStockInBillMain.HDeptID = list[0].HDeptID; + // clsKf_POStockInBillMain.HWHID = list[0].HWHID; + // clsKf_POStockInBillMain.HSCWHID = 0L; + // clsKf_POStockInBillMain.HSupID = list[0].HSupID; + // clsKf_POStockInBillMain.HKeeperID = list[0].HKeeperID; + // clsKf_POStockInBillMain.HSecManagerID = list[0].HSecManagerID; + // clsKf_POStockInBillMain.HEmpID = 0L; + // clsKf_POStockInBillMain.HManagerID = 0L; + // clsKf_POStockInBillMain.HBillerID = list[0].HBillerID; + // clsKf_POStockInBillMain.HRemark = ""; + // clsKf_POStockInBillMain.HInnerBillNo = ""; + // clsKf_POStockInBillMain.HRedBlueFlag = false; + // clsKf_POStockInBillMain.HMainSourceBillType = list[0].HBillType; + // clsKf_POStockInBillMain.HExplanation = list[0].HExplanation; + // bool flag = this.webserver.set_SavePOStockInBill_New(clsKf_POStockInBillMain, hbillType, ref ClsPub.sErrInfo); + // if (flag) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 1; + // this.objJsonResult.Message = "鎴愬姛锛佸崟鎹彿涓猴細"; + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // else + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo; + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // } + // catch (Exception ex) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ex.ToString(); + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // return result; + //} + + /// <summary> /// 鐢熶骇姹囨姤鍗�/鎻愪氦/鐩存帴璋僿ebservice /// </summary> @@ -4158,6 +4275,333 @@ [Route("POStockInBillList/AuditPOInStockBillPost_AR")] [HttpPost] + //public object AuditPOInStockBillPost_AR([FromBody] JObject msg) + //{ + // object result; + // try + // { + // string text = msg["msg"].ToString(); + // text = text.Replace("\\", ""); + // text = text.Replace("\n", ""); + // List<ReciveBill_FastModel> list = JsonConvert.DeserializeObject<List<ReciveBill_FastModel>>(text); + // DAL.ClsCg_POInStockBill clsCg_POInStockBill = new DAL.ClsCg_POInStockBill(); + // string hinterID = list[0].HInterID; + // string text2 = list[0].FID; + // string singleSystemParameter = this.oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref ClsPub.sExeReturnInfo); + // string singleSystemParameter2 = this.oSystemParameter.GetSingleSystemParameter("Cg_POInStockBill_ErpAduit", ref ClsPub.sExeReturnInfo); + // string singleSystemParameter3 = this.oSystemParameter.GetSingleSystemParameter("Cg_POInStockBill_BarCodeCtl", ref ClsPub.sExeReturnInfo); + // string configKey = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName"); + // string empty = string.Empty; + // this.oCn.BeginTran(); + // this.oCn.Commit(); + // bool flag = singleSystemParameter.Contains("瀹夌憺"); + // if (flag) + // { + // DataSet dataSet = this.oCn.RunProcReturn("exec h_p_ReceiveBill_Fast " + hinterID, "h_p_ReceiveBill_Fast"); + // DataRow dataRow = dataSet.Tables[0].Rows[0]; + // bool flag2 = dataSet.Tables[0].Rows.Count <= 0; + // if (flag2) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = "鏈壘鍒板搴旂殑鍗曟嵁"; + // this.objJsonResult.data = null; + // return this.objJsonResult; + // } + // bool flag3 = dataSet.Tables[0].Rows.Count >= 0; + // if (flag3) + // { + // JObject jobject = new JObject(); + // string value = "SLD01_SYS"; + // string value2 = "CG"; + // bool flag4 = dataRow["FTYPENAME"].ToString().Contains("濮斿"); + // if (flag4) + // { + // value = "SLD03_SYS"; + // value2 = "WW"; + // } + // bool flag5 = dataRow["FTYPENAME"].ToString().Contains("璧勪骇"); + // if (flag5) + // { + // value = "SLD04_SYS"; + // value2 = "ZCCG"; + // } + // JObject jobject2 = jobject; + // string propertyName = "FBILLTYPEID"; + // JObject jobject3 = new JObject(); + // jobject3["Fnumber"] = value; + // jobject2.Add(propertyName, jobject3); + // jobject.Add("FBusinessType", value2); + // jobject.Add("FBILLNO", dataRow["HBillNo"].ToString()); + // jobject.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); + // JObject jobject4 = jobject; + // string propertyName2 = "FStockOrgId"; + // JObject jobject5 = new JObject(); + // jobject5["Fnumber"] = dataRow["FRECEIVENUMBER"].ToString(); + // jobject4.Add(propertyName2, jobject5); + // JObject jobject6 = jobject; + // string propertyName3 = "FPurOrgId"; + // JObject jobject7 = new JObject(); + // jobject7["Fnumber"] = dataRow["FPURCHASEORGNUMBER"].ToString(); + // jobject6.Add(propertyName3, jobject7); + // JObject jobject8 = jobject; + // string propertyName4 = "FSupplierId"; + // JObject jobject9 = new JObject(); + // jobject9["Fnumber"] = dataRow["FSUPPLIERNUMBER"].ToString(); + // jobject8.Add(propertyName4, jobject9); + // JObject jobject10 = jobject; + // string propertyName5 = "FPURCHASERID"; + // JObject jobject11 = new JObject(); + // jobject11["Fnumber"] = dataRow["FPURCHASERNUMBER"].ToString(); + // jobject10.Add(propertyName5, jobject11); + // jobject.Add("FOwnerTypeIdHead", "BD_Supplier"); + // JObject jobject12 = jobject; + // string propertyName6 = "FOwnerIdHead"; + // JObject jobject13 = new JObject(); + // jobject13["Fnumber"] = dataRow["FSUPPLIERNUMBER"].ToString(); + // jobject12.Add(propertyName6, jobject13); + // jobject.Add("F_RYMA_Assistant", new JObject() { ["Fnumber"] = dataRow["F_UJDY_Assistant"].ToString() }); + // JArray jarray = new JArray(); + // foreach (object obj in dataSet.Tables[0].Rows) + // { + // DataRow dataRow2 = (DataRow)obj; + // JObject jobject14 = new JObject(); + // JObject jobject15 = jobject14; + // string propertyName7 = "FMaterialId"; + // JObject jobject16 = new JObject(); + // jobject16["Fnumber"] = dataRow2["FMATERIALNUMBER"].ToString(); + // jobject15.Add(propertyName7, jobject16); + // JObject jobject17 = jobject14; + // string propertyName8 = "FUnitID"; + // JObject jobject18 = new JObject(); + // jobject18["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); + // jobject17.Add(propertyName8, jobject18); + // jobject14.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); + // JObject jobject19 = jobject14; + // string propertyName9 = "FPriceUnitId"; + // JObject jobject20 = new JObject(); + // jobject20["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); + // jobject19.Add(propertyName9, jobject20); + // JObject jobject21 = jobject14; + // string propertyName10 = "FStockUnitID"; + // JObject jobject22 = new JObject(); + // jobject22["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); + // jobject21.Add(propertyName10, jobject22); + // JObject jobject23 = jobject14; + // string propertyName11 = "FStockID"; + // JObject jobject24 = new JObject(); + // jobject24["Fnumber"] = "BJCK-SH.01.005"; + // jobject23.Add(propertyName11, jobject24); + // jobject14.Add("FActReceiveQty", Convert.ToDecimal(dataRow2["HQTY"])); + // jobject14.Add("FOwnerTypeId", "BD_OwnerOrg"); + // JObject jobject25 = jobject14; + // string propertyName12 = "FOwnerID"; + // JObject jobject26 = new JObject(); + // jobject26["Fnumber"] = dataRow["FPURCHASEORGNUMBER"].ToString(); + // jobject25.Add(propertyName12, jobject26); + // jobject14.Add("FSrcId", dataRow2["FID"].ToString()); + // jobject14.Add("FSRCFORMID", "PUR_PurchaseOrder"); + // jobject14.Add("FSrcBillNo", dataRow2["FBILLNO"].ToString()); + // jobject14.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString()); + // jobject14.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString()); + // jobject14.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString()); + // jobject14.Add("FPrice", dataRow2["FPRICE"].ToString()); + // jobject14.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); + // jobject14.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); + // JObject jobject27 = jobject14; + // string propertyName13 = "FLOT"; + // JObject jobject28 = new JObject(); + // jobject28["Fnumber"] = dataRow2["hbatchno"].ToString(); + // jobject27.Add(propertyName13, jobject28); + // jobject14.Add("FLOT_TEXT", dataRow2["hbatchno"].ToString()); + // jobject14.Add("FProduceDate", dataRow2["HBeginDate"].ToString()); + // jobject14.Add("FExpiryDate", dataRow2["HEndDate"].ToString()); + // jobject14.Add("F_BGP_ShouldQty", dataRow2["F_BGP_ShouldQty"].ToString()); + // //jobject14.Add("F_RYMA_Assistant", dataRow2["F_RYMA_Assistant"].ToString()); + // jobject14.Add("FDetailEntity_Link", new JArray + // { + // new JObject + // { + // { + // "FDetailEntity_Link_FRULEID", + // "PUR_PurchaseOrder-PUR_ReceiveBill" + // }, + // { + // "FDetailEntity_Link_FSTableName", + // "t_PUR_POOrderEntry" + // }, + // { + // "FDetailEntity_Link_FSBillId", + // dataRow2["FID"].ToString() + // }, + // { + // "FDetailEntity_Link_FSId", + // dataRow2["FEntryID"].ToString() + // } + // } + // }); + // jarray.Add(jobject14); + // } + // jobject.Add("FDetailEntity", jarray); + // JObject jobject29 = new JObject(); + // JObject jobject30 = jobject29; + // string propertyName14 = "FSettleOrgId"; + // JObject jobject31 = new JObject(); + // jobject31["Fnumber"] = dataRow["FSETTLEORGNUMBER"].ToString(); + // jobject30.Add(propertyName14, jobject31); + // JObject jobject32 = jobject29; + // string propertyName15 = "FSettleCurrId"; + // JObject jobject33 = new JObject(); + // jobject33["Fnumber"] = dataRow["FSETTLECURRNUMBER"].ToString(); + // jobject32.Add(propertyName15, jobject33); + // jobject29.Add("FPricePoint", 0); + // jobject.Add("FinanceEntity ", jobject29); + // JObject jobject34 = new JObject(); + // jobject34["Creator"] = ""; + // jobject34["NeedUpDateFields"] = new JArray(); + // jobject34["NeedReturnFields"] = new JArray(); + // jobject34["IsDeleteEntry"] = "false"; + // jobject34["SubSystemId"] = ""; + // jobject34["IsVerifyBaseDataField"] = "false"; + // jobject34["Model"] = jobject; + // JObject jobject35 = jobject34; + // string text3 = InvokeHelper.Login(); + // int num = JObject.Parse(text3)["LoginResultType"].Value<int>(); + // bool flag6 = num == 0; + // if (flag6) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = text3; + // this.objJsonResult.data = null; + // return this.objJsonResult; + // } + // string text4 = InvokeHelper.Save("PUR_ReceiveBill", jobject35.ToString()); + // bool flag7 = JObject.Parse(text4)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE"; + // if (!flag7) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = text4; + // this.objJsonResult.data = null; + // return this.objJsonResult; + // } + // string text5 = JObject.Parse(text4)["Result"]["Number"].ToString(); + // text2 = JObject.Parse(text4)["Result"]["Id"].ToString(); + // } + // else + // { + // LogService.Write("鏀舵枡閫氱煡鍗曞鏍告棤鏁版嵁锛�" + empty, "Vlog", true); + // } + // } + // else + // { + // JObject jobject36 = new JObject(); + // jobject36.Add("Creator", ""); + // jobject36.Add("NeedUpDateFields", new JArray()); + // jobject36.Add("NeedReturnFields", new JArray()); + // jobject36.Add("IsDeleteEntry", "false"); + // jobject36.Add("SubSystemId", ""); + // jobject36.Add("IsVerifyBaseDataField", ""); + // JObject jobject37 = new JObject(); + // jobject37.Add("FID", text2); + // JArray jarray2 = new JArray(); + // foreach (ReciveBill_FastModel reciveBill_FastModel in list) + // { + // bool flag8 = reciveBill_FastModel.HSQty == 0m; + // if (!flag8) + // { + // jarray2.Add(new JObject + // { + // { + // "FEntryID", + // reciveBill_FastModel.FEntryID + // }, + // { + // "FActReceiveQty ", + // reciveBill_FastModel.HSQty + // } + // }); + // } + // } + // jobject37.Add("FDetailEntity", jarray2); + // jobject36.Add("Model", jobject37); + // string text6 = InvokeHelper.Login(); + // int num2 = JObject.Parse(text6)["LoginResultType"].Value<int>(); + // bool flag9 = num2 <= 0; + // if (flag9) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = text6; + // this.objJsonResult.data = null; + // return this.objJsonResult; + // } + // string text7 = InvokeHelper.Save("PUR_ReceiveBill", jobject36.ToString()); + // bool flag10 = JObject.Parse(text7)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; + // if (flag10) + // { + // LogService.Write("鏀舵枡閫氱煡鍗曚慨鏀瑰け璐sonRoot:" + jobject36.ToString(), "Vlog", true); + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟洿鏂板け璐�" + text7; + // this.objJsonResult.data = null; + // return this.objJsonResult; + // } + // } + // var f__AnonymousType = new + // { + // Ids = text2 + // }; + // string text8 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); + // JObject jobject38 = JObject.Parse(text8); + // bool flag11 = jobject38["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; + // if (flag11) + // { + // LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + text8; + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // else + // { + // text8 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); + // jobject38 = JObject.Parse(text8); + // bool flag12 = jobject38["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; + // if (flag12) + // { + // LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + text8; + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // else + // { + // this.objJsonResult.code = "1"; + // this.objJsonResult.count = 1; + // this.objJsonResult.Message = "鎿嶄綔鎴愬姛锛�"; + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // } + // } + // catch (Exception ex) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = "寮傚父锛�" + ex.ToString(); + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // return result; + //} + + + public object AuditPOInStockBillPost_AR([FromBody] JObject msg) { object result; @@ -4167,7 +4611,7 @@ text = text.Replace("\\", ""); text = text.Replace("\n", ""); List<ReciveBill_FastModel> list = JsonConvert.DeserializeObject<List<ReciveBill_FastModel>>(text); - DAL.ClsCg_POInStockBill clsCg_POInStockBill = new DAL.ClsCg_POInStockBill(); + ClsCg_POInStockBill clsCg_POInStockBill = new ClsCg_POInStockBill(); string hinterID = list[0].HInterID; string text2 = list[0].FID; string singleSystemParameter = this.oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref ClsPub.sExeReturnInfo); @@ -4178,12 +4622,16 @@ this.oCn.BeginTran(); this.oCn.Commit(); bool flag = singleSystemParameter.Contains("瀹夌憺"); - if (flag) + bool flag2 = flag; + bool flag3 = flag2; + if (flag3) { DataSet dataSet = this.oCn.RunProcReturn("exec h_p_ReceiveBill_Fast " + hinterID, "h_p_ReceiveBill_Fast"); DataRow dataRow = dataSet.Tables[0].Rows[0]; - bool flag2 = dataSet.Tables[0].Rows.Count <= 0; - if (flag2) + bool flag4 = dataSet.Tables[0].Rows.Count <= 0; + bool flag5 = flag4; + bool flag6 = flag5; + if (flag6) { this.objJsonResult.code = "0"; this.objJsonResult.count = 0; @@ -4191,186 +4639,188 @@ this.objJsonResult.data = null; return this.objJsonResult; } - bool flag3 = dataSet.Tables[0].Rows.Count >= 0; - if (flag3) + bool flag7 = dataSet.Tables[0].Rows.Count >= 0; + bool flag8 = flag7; + bool flag9 = flag8; + if (flag9) { JObject jobject = new JObject(); - string value = "SLD01_SYS"; - string value2 = "CG"; - bool flag4 = dataRow["FTYPENAME"].ToString().Contains("濮斿"); - if (flag4) + string text3 = "SLD01_SYS"; + string text4 = "CG"; + bool flag10 = dataRow["FTYPENAME"].ToString().Contains("濮斿"); + bool flag11 = flag10; + bool flag12 = flag11; + if (flag12) { - value = "SLD03_SYS"; - value2 = "WW"; + text3 = "SLD03_SYS"; + text4 = "WW"; } - bool flag5 = dataRow["FTYPENAME"].ToString().Contains("璧勪骇"); - if (flag5) + bool flag13 = dataRow["FTYPENAME"].ToString().Contains("璧勪骇"); + bool flag14 = flag13; + bool flag15 = flag14; + if (flag15) { - value = "SLD04_SYS"; - value2 = "ZCCG"; + text3 = "SLD04_SYS"; + text4 = "ZCCG"; } JObject jobject2 = jobject; - string propertyName = "FBILLTYPEID"; + string text5 = "FBILLTYPEID"; JObject jobject3 = new JObject(); - jobject3["Fnumber"] = value; - jobject2.Add(propertyName, jobject3); - jobject.Add("FBusinessType", value2); + jobject3["Fnumber"] = text3; + jobject2.Add(text5, jobject3); + jobject.Add("FBusinessType", text4); jobject.Add("FBILLNO", dataRow["HBillNo"].ToString()); jobject.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); JObject jobject4 = jobject; - string propertyName2 = "FStockOrgId"; + string text6 = "FStockOrgId"; JObject jobject5 = new JObject(); jobject5["Fnumber"] = dataRow["FRECEIVENUMBER"].ToString(); - jobject4.Add(propertyName2, jobject5); + jobject4.Add(text6, jobject5); JObject jobject6 = jobject; - string propertyName3 = "FPurOrgId"; + string text7 = "FPurOrgId"; JObject jobject7 = new JObject(); jobject7["Fnumber"] = dataRow["FPURCHASEORGNUMBER"].ToString(); - jobject6.Add(propertyName3, jobject7); + jobject6.Add(text7, jobject7); JObject jobject8 = jobject; - string propertyName4 = "FSupplierId"; + string text8 = "FSupplierId"; JObject jobject9 = new JObject(); jobject9["Fnumber"] = dataRow["FSUPPLIERNUMBER"].ToString(); - jobject8.Add(propertyName4, jobject9); + jobject8.Add(text8, jobject9); JObject jobject10 = jobject; - string propertyName5 = "FPURCHASERID"; + string text9 = "FPURCHASERID"; JObject jobject11 = new JObject(); jobject11["Fnumber"] = dataRow["FPURCHASERNUMBER"].ToString(); - jobject10.Add(propertyName5, jobject11); + jobject10.Add(text9, jobject11); jobject.Add("FOwnerTypeIdHead", "BD_Supplier"); JObject jobject12 = jobject; - string propertyName6 = "FOwnerIdHead"; + string text10 = "FOwnerIdHead"; JObject jobject13 = new JObject(); jobject13["Fnumber"] = dataRow["FSUPPLIERNUMBER"].ToString(); - jobject12.Add(propertyName6, jobject13); - jobject.Add("F_RYMA_Assistant", new JObject() { ["Fnumber"] = dataRow["F_UJDY_Assistant"].ToString() }); + jobject12.Add(text10, jobject13); + JObject jobject14 = jobject; + string text11 = "F_RYMA_Assistant"; + JObject jobject15 = new JObject(); + jobject15["Fnumber"] = dataRow["F_UJDY_Assistant"].ToString(); + jobject14.Add(text11, jobject15); JArray jarray = new JArray(); foreach (object obj in dataSet.Tables[0].Rows) { DataRow dataRow2 = (DataRow)obj; - JObject jobject14 = new JObject(); - JObject jobject15 = jobject14; - string propertyName7 = "FMaterialId"; JObject jobject16 = new JObject(); - jobject16["Fnumber"] = dataRow2["FMATERIALNUMBER"].ToString(); - jobject15.Add(propertyName7, jobject16); - JObject jobject17 = jobject14; - string propertyName8 = "FUnitID"; + JObject jobject17 = jobject16; + string text12 = "FMaterialId"; JObject jobject18 = new JObject(); - jobject18["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); - jobject17.Add(propertyName8, jobject18); - jobject14.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); - JObject jobject19 = jobject14; - string propertyName9 = "FPriceUnitId"; + jobject18["Fnumber"] = dataRow2["FMATERIALNUMBER"].ToString(); + jobject17.Add(text12, jobject18); + JObject jobject19 = jobject16; + string text13 = "FUnitID"; JObject jobject20 = new JObject(); jobject20["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); - jobject19.Add(propertyName9, jobject20); - JObject jobject21 = jobject14; - string propertyName10 = "FStockUnitID"; + jobject19.Add(text13, jobject20); + jobject16.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); + JObject jobject21 = jobject16; + string text14 = "FPriceUnitId"; JObject jobject22 = new JObject(); jobject22["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); - jobject21.Add(propertyName10, jobject22); - JObject jobject23 = jobject14; - string propertyName11 = "FStockID"; + jobject21.Add(text14, jobject22); + JObject jobject23 = jobject16; + string text15 = "FStockUnitID"; JObject jobject24 = new JObject(); - jobject24["Fnumber"] = "BJCK-SH.01.005"; - jobject23.Add(propertyName11, jobject24); - jobject14.Add("FActReceiveQty", Convert.ToDecimal(dataRow2["HQTY"])); - jobject14.Add("FOwnerTypeId", "BD_OwnerOrg"); - JObject jobject25 = jobject14; - string propertyName12 = "FOwnerID"; + jobject24["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); + jobject23.Add(text15, jobject24); + JObject jobject25 = jobject16; + string text16 = "FStockID"; JObject jobject26 = new JObject(); - jobject26["Fnumber"] = dataRow["FPURCHASEORGNUMBER"].ToString(); - jobject25.Add(propertyName12, jobject26); - jobject14.Add("FSrcId", dataRow2["FID"].ToString()); - jobject14.Add("FSRCFORMID", "PUR_PurchaseOrder"); - jobject14.Add("FSrcBillNo", dataRow2["FBILLNO"].ToString()); - jobject14.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString()); - jobject14.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString()); - jobject14.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString()); - jobject14.Add("FPrice", dataRow2["FPRICE"].ToString()); - jobject14.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); - jobject14.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); - JObject jobject27 = jobject14; - string propertyName13 = "FLOT"; + jobject26["Fnumber"] = "BJCK-SH.01.005"; + jobject25.Add(text16, jobject26); + jobject16.Add("FActReceiveQty", Convert.ToDecimal(dataRow2["HQTY"])); + jobject16.Add("FOwnerTypeId", "BD_OwnerOrg"); + JObject jobject27 = jobject16; + string text17 = "FOwnerID"; JObject jobject28 = new JObject(); - jobject28["Fnumber"] = dataRow2["hbatchno"].ToString(); - jobject27.Add(propertyName13, jobject28); - jobject14.Add("FLOT_TEXT", dataRow2["hbatchno"].ToString()); - jobject14.Add("FProduceDate", dataRow2["HBeginDate"].ToString()); - jobject14.Add("FExpiryDate", dataRow2["HEndDate"].ToString()); - jobject14.Add("F_BGP_ShouldQty", dataRow2["F_BGP_ShouldQty"].ToString()); - //jobject14.Add("F_RYMA_Assistant", dataRow2["F_RYMA_Assistant"].ToString()); - jobject14.Add("FDetailEntity_Link", new JArray - { - new JObject - { - { - "FDetailEntity_Link_FRULEID", - "PUR_PurchaseOrder-PUR_ReceiveBill" - }, - { - "FDetailEntity_Link_FSTableName", - "t_PUR_POOrderEntry" - }, - { - "FDetailEntity_Link_FSBillId", - dataRow2["FID"].ToString() - }, - { - "FDetailEntity_Link_FSId", - dataRow2["FEntryID"].ToString() - } - } - }); - jarray.Add(jobject14); + jobject28["Fnumber"] = dataRow["FPURCHASEORGNUMBER"].ToString(); + jobject27.Add(text17, jobject28); + jobject16.Add("FSrcId", dataRow2["FID"].ToString()); + jobject16.Add("FSRCFORMID", "PUR_PurchaseOrder"); + jobject16.Add("FSrcBillNo", dataRow2["FBILLNO"].ToString()); + jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString()); + jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString()); + jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString()); + jobject16.Add("FPrice", dataRow2["FPRICE"].ToString()); + jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); + jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); + JObject jobject29 = jobject16; + string text18 = "FLOT"; + JObject jobject30 = new JObject(); + jobject30["Fnumber"] = dataRow2["hbatchno"].ToString(); + jobject29.Add(text18, jobject30); + jobject16.Add("FLOT_TEXT", dataRow2["hbatchno"].ToString()); + jobject16.Add("FProduceDate", dataRow2["HBeginDate"].ToString()); + jobject16.Add("FExpiryDate", dataRow2["HEndDate"].ToString()); + jobject16.Add("F_BGP_ShouldQty", dataRow2["F_BGP_ShouldQty"].ToString()); + jobject16.Add("F_UJDY_Qty", dataRow2["HQTY"].ToString()); + JObject jobject31 = jobject16; + string text19 = "FDetailEntity_Link"; + JArray jarray2 = new JArray(); + JObject jobject32 = new JObject(); + jobject32.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill"); + jobject32.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry"); + jobject32.Add("FDetailEntity_Link_FSBillId", dataRow2["FID"].ToString()); + jobject32.Add("FDetailEntity_Link_FSId", dataRow2["FEntryID"].ToString()); + jarray2.Add(jobject32); + jobject31.Add(text19, jarray2); + jarray.Add(jobject16); } jobject.Add("FDetailEntity", jarray); - JObject jobject29 = new JObject(); - JObject jobject30 = jobject29; - string propertyName14 = "FSettleOrgId"; - JObject jobject31 = new JObject(); - jobject31["Fnumber"] = dataRow["FSETTLEORGNUMBER"].ToString(); - jobject30.Add(propertyName14, jobject31); - JObject jobject32 = jobject29; - string propertyName15 = "FSettleCurrId"; JObject jobject33 = new JObject(); - jobject33["Fnumber"] = dataRow["FSETTLECURRNUMBER"].ToString(); - jobject32.Add(propertyName15, jobject33); - jobject29.Add("FPricePoint", 0); - jobject.Add("FinanceEntity ", jobject29); - JObject jobject34 = new JObject(); - jobject34["Creator"] = ""; - jobject34["NeedUpDateFields"] = new JArray(); - jobject34["NeedReturnFields"] = new JArray(); - jobject34["IsDeleteEntry"] = "false"; - jobject34["SubSystemId"] = ""; - jobject34["IsVerifyBaseDataField"] = "false"; - jobject34["Model"] = jobject; - JObject jobject35 = jobject34; - string text3 = InvokeHelper.Login(); - int num = JObject.Parse(text3)["LoginResultType"].Value<int>(); - bool flag6 = num == 0; - if (flag6) + JObject jobject34 = jobject33; + string text20 = "FSettleOrgId"; + JObject jobject35 = new JObject(); + jobject35["Fnumber"] = dataRow["FSETTLEORGNUMBER"].ToString(); + jobject34.Add(text20, jobject35); + JObject jobject36 = jobject33; + string text21 = "FSettleCurrId"; + JObject jobject37 = new JObject(); + jobject37["Fnumber"] = dataRow["FSETTLECURRNUMBER"].ToString(); + jobject36.Add(text21, jobject37); + jobject33.Add("FPricePoint", 0); + jobject.Add("FinanceEntity ", jobject33); + JObject jobject38 = new JObject(); + jobject38["Creator"] = ""; + jobject38["NeedUpDateFields"] = new JArray(); + jobject38["NeedReturnFields"] = new JArray(); + jobject38["IsDeleteEntry"] = "false"; + jobject38["SubSystemId"] = ""; + jobject38["IsVerifyBaseDataField"] = "false"; + jobject38["Model"] = jobject; + JObject jobject39 = jobject38; + string text22 = InvokeHelper.Login(); + int num = Extensions.Value<int>(JObject.Parse(text22)["LoginResultType"]); + bool flag16 = num == 0; + bool flag17 = flag16; + bool flag18 = flag17; + if (flag18) { this.objJsonResult.code = "0"; this.objJsonResult.count = 0; - this.objJsonResult.Message = text3; + this.objJsonResult.Message = text22; this.objJsonResult.data = null; return this.objJsonResult; } - string text4 = InvokeHelper.Save("PUR_ReceiveBill", jobject35.ToString()); - bool flag7 = JObject.Parse(text4)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE"; - if (!flag7) + string text23 = InvokeHelper.Save("PUR_ReceiveBill", jobject39.ToString()); + bool flag19 = JObject.Parse(text23)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE"; + bool flag20 = !flag19; + bool flag21 = flag20; + if (flag21) { this.objJsonResult.code = "0"; this.objJsonResult.count = 0; - this.objJsonResult.Message = text4; + this.objJsonResult.Message = text23; this.objJsonResult.data = null; return this.objJsonResult; } - string text5 = JObject.Parse(text4)["Result"]["Number"].ToString(); - text2 = JObject.Parse(text4)["Result"]["Id"].ToString(); + string text24 = JObject.Parse(text23)["Result"]["Number"].ToString(); + text2 = JObject.Parse(text23)["Result"]["Id"].ToString(); } else { @@ -4379,55 +4829,55 @@ } else { - JObject jobject36 = new JObject(); - jobject36.Add("Creator", ""); - jobject36.Add("NeedUpDateFields", new JArray()); - jobject36.Add("NeedReturnFields", new JArray()); - jobject36.Add("IsDeleteEntry", "false"); - jobject36.Add("SubSystemId", ""); - jobject36.Add("IsVerifyBaseDataField", ""); - JObject jobject37 = new JObject(); - jobject37.Add("FID", text2); - JArray jarray2 = new JArray(); + JObject jobject40 = new JObject(); + jobject40.Add("Creator", ""); + jobject40.Add("NeedUpDateFields", new JArray()); + jobject40.Add("NeedReturnFields", new JArray()); + jobject40.Add("IsDeleteEntry", "false"); + jobject40.Add("SubSystemId", ""); + jobject40.Add("IsVerifyBaseDataField", ""); + JObject jobject41 = new JObject(); + jobject41.Add("FID", text2); + JArray jarray3 = new JArray(); foreach (ReciveBill_FastModel reciveBill_FastModel in list) { - bool flag8 = reciveBill_FastModel.HSQty == 0m; - if (!flag8) + bool flag22 = reciveBill_FastModel.HSQty == 0m; + bool flag23 = !flag22; + bool flag24 = flag23; + if (flag24) { - jarray2.Add(new JObject - { - { - "FEntryID", - reciveBill_FastModel.FEntryID - }, - { - "FActReceiveQty ", - reciveBill_FastModel.HSQty - } - }); + JArray jarray4 = jarray3; + JObject jobject42 = new JObject(); + jobject42.Add("FEntryID", reciveBill_FastModel.FEntryID); + jobject42.Add("FActReceiveQty ", reciveBill_FastModel.HSQty); + jarray4.Add(jobject42); } } - jobject37.Add("FDetailEntity", jarray2); - jobject36.Add("Model", jobject37); - string text6 = InvokeHelper.Login(); - int num2 = JObject.Parse(text6)["LoginResultType"].Value<int>(); - bool flag9 = num2 <= 0; - if (flag9) + jobject41.Add("FDetailEntity", jarray3); + jobject40.Add("Model", jobject41); + string text25 = InvokeHelper.Login(); + int num2 = Extensions.Value<int>(JObject.Parse(text25)["LoginResultType"]); + bool flag25 = num2 <= 0; + bool flag26 = flag25; + bool flag27 = flag26; + if (flag27) { this.objJsonResult.code = "0"; this.objJsonResult.count = 0; - this.objJsonResult.Message = text6; + this.objJsonResult.Message = text25; this.objJsonResult.data = null; return this.objJsonResult; } - string text7 = InvokeHelper.Save("PUR_ReceiveBill", jobject36.ToString()); - bool flag10 = JObject.Parse(text7)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; - if (flag10) + string text26 = InvokeHelper.Save("PUR_ReceiveBill", jobject40.ToString()); + bool flag28 = JObject.Parse(text26)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; + bool flag29 = flag28; + bool flag30 = flag29; + if (flag30) { - LogService.Write("鏀舵枡閫氱煡鍗曚慨鏀瑰け璐sonRoot:" + jobject36.ToString(), "Vlog", true); + LogService.Write("鏀舵枡閫氱煡鍗曚慨鏀瑰け璐sonRoot:" + jobject40.ToString(), "Vlog", true); this.objJsonResult.code = "0"; this.objJsonResult.count = 0; - this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟洿鏂板け璐�" + text7; + this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟洿鏂板け璐�" + text26; this.objJsonResult.data = null; return this.objJsonResult; } @@ -4436,29 +4886,33 @@ { Ids = text2 }; - string text8 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); - JObject jobject38 = JObject.Parse(text8); - bool flag11 = jobject38["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; - if (flag11) + string text27 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); + JObject jobject43 = JObject.Parse(text27); + bool flag31 = jobject43["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; + bool flag32 = flag31; + bool flag33 = flag32; + if (flag33) { LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); this.objJsonResult.code = "0"; this.objJsonResult.count = 0; - this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + text8; + this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + text27; this.objJsonResult.data = null; result = this.objJsonResult; } else { - text8 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); - jobject38 = JObject.Parse(text8); - bool flag12 = jobject38["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; - if (flag12) + text27 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); + jobject43 = JObject.Parse(text27); + bool flag34 = jobject43["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; + bool flag35 = flag34; + bool flag36 = flag35; + if (flag36) { LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); this.objJsonResult.code = "0"; this.objJsonResult.count = 0; - this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + text8; + this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + text27; this.objJsonResult.data = null; result = this.objJsonResult; } @@ -4482,7 +4936,6 @@ } return result; } - #region PDA鍏朵粬鍑哄簱 @@ -4572,7 +5025,7 @@ '@' }); string text = array[0]; - long num = ClsPub.isLong(array[4]); + Double num = ClsPub.isDoule(array[4]); string text2 = array[6]; DateTime dateTime = ClsPub.isDate(array[3]); DateTime dateTime2 = ClsPub.isDate(array[5]); diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs index d59654b..4a98976 100644 --- a/WebAPI/Controllers/ProductInController.cs +++ b/WebAPI/Controllers/ProductInController.cs @@ -327,31 +327,58 @@ /// <returns></returns> [Route("OtherOutBill_Check_New/get_InfoByBarCode_Source_Json")] [HttpGet] - public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID) + //public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID) + //{ + // 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); + // //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_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, 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_InfoByBarCode_Source_Json(string sCode, long sInterID, string HBillType, string sBillNo, string sMaker, long WhID, long SPID, long sQty, long HOWNERID) { 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); - //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_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo); - if (WebSoBar == null) + WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo); + bool flag = WebSoBar == 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 = WebSoBar; + result = this.objJsonResult; } + return result; } @@ -1137,67 +1164,123 @@ [HttpPost] public object set_SaveProductInBill_Json([FromBody]JObject oMain) { - var _value = oMain["oMain"].ToString(); - string msg1 = _value.ToString(); - //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>(); - //ListModels oListModels = new ListModels(); - //lsmain = oListModels.getProductInBillMainByJson(msg1); - //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; - //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill(); - //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo); - + //var _value = oMain["oMain"].ToString(); + //string msg1 = _value.ToString(); + ////List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>(); + ////ListModels oListModels = new ListModels(); + ////lsmain = oListModels.getProductInBillMainByJson(msg1); + ////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; + ////BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill(); + ////return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo); + + //try + //{ + // List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>(); + // ListModels oListModels = new ListModels(); + // lsmain = oListModels.getProductInBillMainByJson(msg1); + // //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_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain(); + + // websLsmain.HInterID = lsmain[0].HInterID; + // websLsmain.HDate = lsmain[0].HDate; + // websLsmain.HBillNo = lsmain[0].HBillNo; + // websLsmain.HDeptID = lsmain[0].HDeptID; + // websLsmain.HEmpID = lsmain[0].HEmpID; + // websLsmain.HKeeperID= lsmain[0].HKeeperID; + // websLsmain.HRemark = lsmain[0].HRemark; + // websLsmain.HMaker = lsmain[0].HMaker; + // websLsmain.HWHID = lsmain[0].HWHID; + // websLsmain.HSupID = lsmain[0].HSupID; + // websLsmain.HExplanation = lsmain[0].HExplanation; + // websLsmain.HBillType = "1202";//鍥哄畾鍊� + + + // if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo)) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�"; + // objJsonResult.data = null; + // return objJsonResult; + // } + // else + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo; + // objJsonResult.data = null; + // return objJsonResult; + // } + //} + //catch (Exception e) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString(); + // objJsonResult.data = null; + // return objJsonResult; + //} + + + + + + string text = oMain["oMain"].ToString(); + string jsonString = text.ToString(); + object result; try { - List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>(); - ListModels oListModels = new ListModels(); - lsmain = oListModels.getProductInBillMainByJson(msg1); - //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_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain(); - - websLsmain.HInterID = lsmain[0].HInterID; - websLsmain.HDate = lsmain[0].HDate; - websLsmain.HBillNo = lsmain[0].HBillNo; - websLsmain.HDeptID = lsmain[0].HDeptID; - websLsmain.HEmpID = lsmain[0].HEmpID; - websLsmain.HKeeperID= lsmain[0].HKeeperID; - websLsmain.HRemark = lsmain[0].HRemark; - websLsmain.HMaker = lsmain[0].HMaker; - websLsmain.HWHID = lsmain[0].HWHID; - websLsmain.HSupID = lsmain[0].HSupID; - websLsmain.HExplanation = lsmain[0].HExplanation; - websLsmain.HBillType = "1202";//鍥哄畾鍊� - - - if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo)) + List<ClsKf_ProductInBillMain> list = new List<ClsKf_ProductInBillMain>(); + ListModels listModels = new ListModels(); + list = listModels.getProductInBillMainByJson(jsonString); + list[0].HYear = ClsPub.isLong(DateTime.Now.Year); + list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); + string hbillType = list[0].HBillType; + WebAPI.WebS.ClsKf_ProductInBillMain clsKf_ProductInBillMain = new WebAPI.WebS.ClsKf_ProductInBillMain(); + clsKf_ProductInBillMain.HInterID = list[0].HInterID; + clsKf_ProductInBillMain.HDate = list[0].HDate; + clsKf_ProductInBillMain.HBillNo = list[0].HBillNo; + clsKf_ProductInBillMain.HDeptID = list[0].HDeptID; + clsKf_ProductInBillMain.HEmpID = list[0].HEmpID; + clsKf_ProductInBillMain.HKeeperID = list[0].HKeeperID; + clsKf_ProductInBillMain.HRemark = list[0].HRemark; + clsKf_ProductInBillMain.HMaker = list[0].HMaker; + clsKf_ProductInBillMain.HWHID = list[0].HWHID; + clsKf_ProductInBillMain.HSupID = list[0].HSupID; + clsKf_ProductInBillMain.HExplanation = list[0].HExplanation; + clsKf_ProductInBillMain.HBillType = "1202"; + bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo); + if (flag) { - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�"; - objJsonResult.data = null; - return objJsonResult; + this.objJsonResult.code = "0"; + this.objJsonResult.count = 1; + this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�"; + this.objJsonResult.data = null; + result = this.objJsonResult; } else { - 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; } } - catch (Exception e) + catch (Exception ex) { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString(); - objJsonResult.data = null; - return objJsonResult; + this.objJsonResult.code = "0"; + this.objJsonResult.count = 0; + this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ex.ToString(); + this.objJsonResult.data = null; + result = this.objJsonResult; } + return result; } /// <summary> diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 9a71202..1c1bcbf 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -1092,6 +1092,259 @@ } + ///// <summary> + ///// 鐢熸垚閲戣澏浜戞潵鏂欐楠屽崟 + ///// </summary> + ///// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param> + ///// <returns></returns> + //[Route("QCStockInCheckBill/set_SaveQCStockInCheckBill_Json")] + //[HttpGet] + //public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber, + // double HCheckQty, double HRightQty, double HBadQty, + // string HCheckResult, string HSupNumber, + // string HUseResult, Int64 HSeQ, Int64 HSourceInterID, + // Int64 HSourceEntryID, string HSourceBillNo, string user, + // Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID, + // Int64 HMaterID, string HSourceBillType, Int64 HSLInterID, + // Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID) + //{ + // try + // { + // //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿 + // //Int64 HInterID = DBUtility.ClsPub.CreateBillID("7503", ref DBUtility.ClsPub.sExeReturnInfo); + // //string HBillNo = DBUtility.ClsPub.CreateBillCode("7503", ref DBUtility.ClsPub.sExeReturnInfo, true); + + // DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList where HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList"); + // string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFileName"]); + // string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFilePath"]); + + + + // string path = HFilePath; + // FileInfo fi = new FileInfo(path); + // long len = fi.Length; + // byte[] buffer = new byte[len]; + // FileStream fs = new FileStream(path, FileMode.Open); + // fs.Read(buffer, 0, (int)len); + // //鏂囦欢IO娴� + // string a = Convert.ToBase64String(buffer); + + + // //淇濆瓨 + // oCN.BeginTran(); + // //鐢熶骇姹囨姤鍗曚富琛� + // oCN.RunProc("Insert Into QC_POStockInCheckBillMain " + + // "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" + + // ",HYear,HPeriod,HRemark,HSupID,HMaterID" + + // ",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" + + // ",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" + + // ") " + + // " values('7503','7503'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" + + // ",DATENAME(YEAR,GETDATE()),0,''," + HSupID.ToString() + "," + HMaterID.ToString() + + // ",'" + HCheckQty.ToString() + "','" + HCheckQty.ToString() + "','" + HRightQty.ToString() + "','" + HBadQty.ToString() + "','" + HKeeperID.ToString() + "'" + + // ",'" + HCheckResult.ToString() + "','', '','',''" + + // ") "); + // //鐢熶骇姹囨姤鍗曞瓙琛� + // oCN.RunProc("Insert into QC_POStockInCheckBillSub " + + // " (HInterID,HEntryID,HCloseMan,HCloseType" + + // ",HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" + + // ",HRelationQty,HRelationMoney,HQCCheckClassID,HQCCheckItemID,HQCStd," + + // "HResult,HQCRelValue,HProcCheckEmp,HProcCheckTime" + + // ") values(" + // + HInterID.ToString() + ",1,'',''" + + // ",''," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','" + HSourceBillType.ToString() + "'" + + // ",0,0,0,0,''" + + // ",'" + HCheckResult.ToString() + "','" + HCheckResult.ToString() + "','" + HKeeperID.ToString() + "',getdate()" + + // ") "); + // //鍚屾閲戣澏 + // //璁块棶閲戣澏 + // var loginRet = InvokeHelper.Login(); + // var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>(); + // if (isSuccess == 0) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet; + // objJsonResult.data = null; + // return objJsonResult; + // } + + + // JObject model = new JObject(); + // model.Add("FBillTypeID", new JObject() { ["Fnumber"] = "JYD001_SYS" }); //鍗曟嵁绫诲瀷 鏉ユ枡妫�楠屽崟JYD001_SYS + // model.Add("FBusinessType", "1"); //涓氬姟绫诲瀷 + // model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡 + // model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐 + // model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐 + // model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝� + // model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 鎶ユ鏃ユ湡 + // model.Add("FBillNo", HBillNo); + + // JArray Fentity = new JArray(); + // JObject FentityModel = new JObject(); + // FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜 + // FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//璁¢噺鍗曚綅鍐呯爜 + // FentityModel.Add("FInspectQty", HCheckQty.ToString());// 妫�楠屾暟閲� + // FentityModel.Add("FQualifiedQty", HRightQty.ToString());// 鍚堟牸鏁伴噺 + // FentityModel.Add("FUnqualifiedQty", HBadQty.ToString());// 涓嶅悎鏍兼暟閲� + // FentityModel.Add("FInspectResult", HCheckResult.ToString());// 妫�楠岀粨鏋� + // FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵�� + // FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇� + // FentityModel.Add("FSrcBillType0", "PUR_ReceiveBill");// 婧愬崟绫诲瀷 + // FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅 + // FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲� + // FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟� + // //FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱 + // FentityModel.Add("FInspectTimes","1"); // 妫�楠屾鏁� + // FentityModel.Add("FTimeUnit","24");//鏃堕棿鍗曚綅 + // FentityModel.Add("FSAMPLEDAMAGEBEARER","2");//鏍锋湰鐮村潖鎵挎媴鏂� + // FentityModel.Add("FISFIRSTINSPECT", false);//棣栨 + // FentityModel.Add("FBaseQualifiedQty", HRightQty.ToString());//鍩烘湰鍗曚綅鍚堟牸鏁� + // FentityModel.Add("FBaseAcceptQty", HRightQty.ToString());//鍩烘湰鍗曚綅鎺ユ敹鏁� + // FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆 + // FentityModel.Add("FIsSplitRow ", false);// 鏄惁鎷嗗垎琛� + + // JArray Fentity2 = new JArray(); + // JObject FentityModel2 = new JObject(); + // FentityModel2.Add("FPolicyMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜 + // FentityModel2.Add("FPolicyStatus", "1"); //鐘舵�� + // FentityModel2.Add("FPolicyQty", HRightQty.ToString()); //鏁伴噺 + // FentityModel2.Add("FBasePolicyQty", HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺 + // FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥 + // FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥 + // FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊 + // FentityModel2.Add("FCanSale", false); //鍙攢鍞� + // FentityModel2.Add("FIsMRBReview", false); //MRP璇勫 + // FentityModel2.Add("FIsReturn", true); //鍒ら�� + // FentityModel2.Add("FIsRelatedDefect", false); //涓嶈壇鍝佸叧鑱旀爣蹇� + // Fentity2.Add(FentityModel2); + // FentityModel.Add("FPolicyDetail", Fentity2); + + + + // JArray Fentity3 = new JArray(); + // JObject FentityModel3 = new JObject(); + // FentityModel3.Add("FDetailID", "0");// + // FentityModel3.Add("FSrcBillType", "PUR_ReceiveBill"); //婧愬崟绫诲瀷 + // FentityModel3.Add("FSrcBillNo", HSLBillNo.ToString()); //鏀舵枡閫氱煡鍗曞崟鍙� + // FentityModel3.Add("FSrcInterId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富ID + // FentityModel3.Add("FSrcEntryId",HSLEntryID.ToString()); //鏀舵枡閫氱煡鍗曞瓙ID + // FentityModel3.Add("FSrcEntrySeq", HSLSeQ.ToString()); //婧愬崟琛屽彿 + // FentityModel3.Add("FOrderType", new JObject() { ["FID"] = "PUR_PurchaseOrder" }); // 璁㈠崟绫诲瀷 + // FentityModel3.Add("FOrderBillNo", HSourceBillNo.ToString()); //璁㈠崟鍗曞彿 + // FentityModel3.Add("FOrderId", HSourceInterID.ToString()); //璁㈠崟涓籌D + // FentityModel3.Add("FOrderEntryId", HSourceEntryID.ToString()); //璁㈠崟瀛怚D + // FentityModel3.Add("FOrderEntrySeq", HSeQ.ToString()); //璁㈠崟琛屽彿 + // Fentity3.Add(FentityModel3); + // FentityModel.Add("FReferDetail", Fentity3); + + + // JArray Fentity4 = new JArray(); + // JObject FentityModel4 = new JObject(); + // FentityModel4.Add("FEntity_Link_FRuleId", "QM_PURReceive2Inspect"); //鍗曟嵁杞崲瑙勫垯 + // FentityModel4.Add("FEntity_Link_FSTableName", "T_PUR_RECEIVEENTRY"); //鏀舵枡閫氱煡鍗曞瓙琛� + // FentityModel4.Add("FEntity_Link_FSBillId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富鍐呯爜 + // FentityModel4.Add("FEntity_Link_FSId", HSLEntryID.ToString()); //鏀舵枡閫氱煡鍗曞瓙鍐呯爜 + // FentityModel4.Add("FEntity_Link_FBaseAcceptQty", HRightQty.ToString()); // + // FentityModel4.Add("FEntity_Link_FBaseAcceptQtyOld", HRightQty.ToString()); // + // FentityModel4.Add("FEntity_Link_FBaseInspectQtyOld", HRightQty.ToString()); // + // FentityModel4.Add("FEntity_Link_FInspectQtyOld", HRightQty.ToString()); // + // Fentity4.Add(FentityModel4); + // FentityModel.Add("FEntity_Link", Fentity4); + + + + // Fentity.Add(FentityModel); + // model.Add("FEntity", Fentity); //鏄庣粏淇℃伅 + // JObject jsonRoot = new JObject() + // { + // ["Creator"] = "", + // ["NeedUpDateFields"] = new JArray(), + // ["NeedReturnFields"] = new JArray(), + // ["IsDeleteEntry"] = "false", + // ["SubSystemId"] = "", + // ["IsVerifyBaseDataField"] = "false", + // //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳� + // ["Model"] = model + // }; + + // string result = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨 + // //鍒ゆ柇淇濆瓨鏄惁鎴愬姛 + // if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") + // { + // LogService.Write("鏉ユ枡妫�楠屽崟淇濆瓨閿欒jsonRoot:" + jsonRoot); + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍚屾閲戣澏浜戝け璐ワ紒鍗曞彿:{HBillNo.ToString()}" + jsonRoot; + // objJsonResult.data = null; + // return objJsonResult; + // } + // //鎻愪氦瀹℃牳 + // string result1 = string.Empty; + // string result2 = string.Empty; + // var fID = JObject.Parse(result)["Result"]["Id"].ToString(); + // var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString(); + // var json = new + // { + // Ids = fID, + // }; + + // K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/"); + + + + // result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 + // result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 + // if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") + // { + + + + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result; + // objJsonResult.data = null; + // return objJsonResult; + // } + // else + // { + // string jsonStr = "{" + + // " \"FileName\":\"" + HFileName + "\"," + + // " \"FormId\":\"QM_InspectBill\"," + + // " \"IsLast\":\"true\"," + + // " \"InterId\":\"" + HInterID + "\"," + + // " \"BillNO\":\"" + HBillNo + "\"," + + // " \"AliasFileName\":\"test\"," + + // " \"SendByte\":\"" + a + "\"," + + // "}"; + + // var ret = client.AttachmentUpload(jsonStr); + // } + + // oCN.Commit(); + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + // objJsonResult.data = 1; + // return objJsonResult; + // } + // catch (Exception e) + // { + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "Exception锛�" + e.ToString(); + // objJsonResult.data = null; + // return objJsonResult; + // } + //} + //#endregion + + + + /// <summary> /// 鐢熸垚閲戣澏浜戞潵鏂欐楠屽崟 /// </summary> @@ -1099,240 +1352,39 @@ /// <returns></returns> [Route("QCStockInCheckBill/set_SaveQCStockInCheckBill_Json")] [HttpGet] - public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber, + public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber, double HCheckQty, double HRightQty, double HBadQty, - string HCheckResult, string HSupNumber, string HWHNumber, - string HUseResult, Int64 HSeQ, Int64 HSourceInterID, + string HCheckResult, string HSupNumber, + string HUseResult, Int64 HSeQ, Int64 HSourceInterID, Int64 HSourceEntryID, string HSourceBillNo, string user, - Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID, + Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID, Int64 HMaterID, string HSourceBillType, Int64 HSLInterID, - Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID) + Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID,ref string sErrMsg) { - try + WebS2.WebService1 oWebs1 = new WebS2.WebService1(); + + + //oWebs1.Url = "http://localhost:9099/WebService1.asmx"; + //K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/"); + if (oWebs1.set_SaveQcStockInCheckBill_New(HZJOrgNumber, HMaterNumber, HUnitNumber, HCheckQty, HRightQty, HBadQty + , HCheckResult, HSupNumber, HUseResult, HSeQ, HSourceInterID + , HSourceEntryID, HSourceBillNo, user, HWHID, HSPID + , HSupID, HKeeperID, HMaterID, HSourceBillType, HSLInterID + , HSLEntryID, HSLBillNo, HSLSeQ, HBillNo, HInterID + , ref sErrMsg)) { - //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿 - //Int64 HInterID = DBUtility.ClsPub.CreateBillID("7503", ref DBUtility.ClsPub.sExeReturnInfo); - //string HBillNo = DBUtility.ClsPub.CreateBillCode("7503", ref DBUtility.ClsPub.sExeReturnInfo, true); - - DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList where HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList"); - string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFileName"]); - string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFilePath"]); - - - - string path = HFilePath; - FileInfo fi = new FileInfo(path); - long len = fi.Length; - byte[] buffer = new byte[len]; - FileStream fs = new FileStream(path, FileMode.Open); - fs.Read(buffer, 0, (int)len); - //鏂囦欢IO娴� - string a = Convert.ToBase64String(buffer); - - - //淇濆瓨 - oCN.BeginTran(); - //鐢熶骇姹囨姤鍗曚富琛� - oCN.RunProc("Insert Into QC_POStockInCheckBillMain " + - "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" + - ",HYear,HPeriod,HRemark,HSupID,HMaterID" + - ",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" + - ",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" + - ") " + - " values('7503','7503'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" + - ",DATENAME(YEAR,GETDATE()),0,''," + HSupID.ToString() + "," + HMaterID.ToString() + - ",'" + HCheckQty.ToString() + "','" + HCheckQty.ToString() + "','" + HRightQty.ToString() + "','" + HBadQty.ToString() + "','" + HKeeperID.ToString() + "'" + - ",'" + HCheckResult.ToString() + "','', '','',''" + - ") "); - //鐢熶骇姹囨姤鍗曞瓙琛� - oCN.RunProc("Insert into QC_POStockInCheckBillSub " + - " (HInterID,HEntryID,HCloseMan,HCloseType" + - ",HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" + - ",HRelationQty,HRelationMoney,HQCCheckClassID,HQCCheckItemID,HQCStd," + - "HResult,HQCRelValue,HProcCheckEmp,HProcCheckTime" + - ") values(" - + HInterID.ToString() + ",1,'',''" + - ",''," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','" + HSourceBillType.ToString() + "'" + - ",0,0,0,0,''" + - ",'" + HCheckResult.ToString() + "','" + HCheckResult.ToString() + "','" + HKeeperID.ToString() + "',getdate()" + - ") "); - //鍚屾閲戣澏 - //璁块棶閲戣澏 - var loginRet = InvokeHelper.Login(); - var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>(); - if (isSuccess == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet; - objJsonResult.data = null; - return objJsonResult; - } - - - JObject model = new JObject(); - model.Add("FBillTypeID", new JObject() { ["Fnumber"] = "JYD001_SYS" }); //鍗曟嵁绫诲瀷 鏉ユ枡妫�楠屽崟JYD001_SYS - model.Add("FBusinessType", "1"); //涓氬姟绫诲瀷 - model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡 - model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐 - model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐 - model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝� - model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 鎶ユ鏃ユ湡 - model.Add("FBillNo", HBillNo); - - JArray Fentity = new JArray(); - JObject FentityModel = new JObject(); - FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜 - FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//璁¢噺鍗曚綅鍐呯爜 - FentityModel.Add("FInspectQty", HCheckQty.ToString());// 妫�楠屾暟閲� - FentityModel.Add("FQualifiedQty", HRightQty.ToString());// 鍚堟牸鏁伴噺 - FentityModel.Add("FUnqualifiedQty", HBadQty.ToString());// 涓嶅悎鏍兼暟閲� - FentityModel.Add("FInspectResult", HCheckResult.ToString());// 妫�楠岀粨鏋� - FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵�� - FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇� - FentityModel.Add("FSrcBillType0", "PUR_ReceiveBill");// 婧愬崟绫诲瀷 - FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅 - FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲� - FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟� - //FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱 - FentityModel.Add("FInspectTimes","1"); // 妫�楠屾鏁� - FentityModel.Add("FTimeUnit","24");//鏃堕棿鍗曚綅 - FentityModel.Add("FSAMPLEDAMAGEBEARER","2");//鏍锋湰鐮村潖鎵挎媴鏂� - FentityModel.Add("FISFIRSTINSPECT", false);//棣栨 - FentityModel.Add("FBaseQualifiedQty", HRightQty.ToString());//鍩烘湰鍗曚綅鍚堟牸鏁� - FentityModel.Add("FBaseAcceptQty", HRightQty.ToString());//鍩烘湰鍗曚綅鎺ユ敹鏁� - FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆 - FentityModel.Add("FIsSplitRow ", false);// 鏄惁鎷嗗垎琛� - - JArray Fentity2 = new JArray(); - JObject FentityModel2 = new JObject(); - FentityModel2.Add("FPolicyMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜 - FentityModel2.Add("FPolicyStatus", "1"); //鐘舵�� - FentityModel2.Add("FPolicyQty", HRightQty.ToString()); //鏁伴噺 - FentityModel2.Add("FBasePolicyQty", HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺 - FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥 - FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥 - FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊 - FentityModel2.Add("FCanSale", false); //鍙攢鍞� - FentityModel2.Add("FIsMRBReview", false); //MRP璇勫 - FentityModel2.Add("FIsReturn", true); //鍒ら�� - FentityModel2.Add("FIsRelatedDefect", false); //涓嶈壇鍝佸叧鑱旀爣蹇� - Fentity2.Add(FentityModel2); - FentityModel.Add("FPolicyDetail", Fentity2); - - - - JArray Fentity3 = new JArray(); - JObject FentityModel3 = new JObject(); - FentityModel3.Add("FDetailID", "0");// - FentityModel3.Add("FSrcBillType", "PUR_ReceiveBill"); //婧愬崟绫诲瀷 - FentityModel3.Add("FSrcBillNo", HSLBillNo.ToString()); //鏀舵枡閫氱煡鍗曞崟鍙� - FentityModel3.Add("FSrcInterId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富ID - FentityModel3.Add("FSrcEntryId",HSLEntryID.ToString()); //鏀舵枡閫氱煡鍗曞瓙ID - FentityModel3.Add("FSrcEntrySeq", HSLSeQ.ToString()); //婧愬崟琛屽彿 - FentityModel3.Add("FOrderType", new JObject() { ["FID"] = "PUR_PurchaseOrder" }); // 璁㈠崟绫诲瀷 - FentityModel3.Add("FOrderBillNo", HSourceBillNo.ToString()); //璁㈠崟鍗曞彿 - FentityModel3.Add("FOrderId", HSourceInterID.ToString()); //璁㈠崟涓籌D - FentityModel3.Add("FOrderEntryId", HSourceEntryID.ToString()); //璁㈠崟瀛怚D - FentityModel3.Add("FOrderEntrySeq", HSeQ.ToString()); //璁㈠崟琛屽彿 - Fentity3.Add(FentityModel3); - FentityModel.Add("FReferDetail", Fentity3); - - - JArray Fentity4 = new JArray(); - JObject FentityModel4 = new JObject(); - FentityModel4.Add("FEntity_Link_FRuleId", "QM_PURReceive2Inspect"); //鍗曟嵁杞崲瑙勫垯 - FentityModel4.Add("FEntity_Link_FSTableName", "T_PUR_RECEIVEENTRY"); //鏀舵枡閫氱煡鍗曞瓙琛� - FentityModel4.Add("FEntity_Link_FSBillId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富鍐呯爜 - FentityModel4.Add("FEntity_Link_FSId", HSLEntryID.ToString()); //鏀舵枡閫氱煡鍗曞瓙鍐呯爜 - FentityModel4.Add("FEntity_Link_FBaseAcceptQty", HRightQty.ToString()); // - FentityModel4.Add("FEntity_Link_FBaseAcceptQtyOld", HRightQty.ToString()); // - FentityModel4.Add("FEntity_Link_FBaseInspectQtyOld", HRightQty.ToString()); // - FentityModel4.Add("FEntity_Link_FInspectQtyOld", HRightQty.ToString()); // - Fentity4.Add(FentityModel4); - FentityModel.Add("FEntity_Link", Fentity4); - - - - Fentity.Add(FentityModel); - model.Add("FEntity", Fentity); //鏄庣粏淇℃伅 - JObject jsonRoot = new JObject() - { - ["Creator"] = "", - ["NeedUpDateFields"] = new JArray(), - ["NeedReturnFields"] = new JArray(), - ["IsDeleteEntry"] = "false", - ["SubSystemId"] = "", - ["IsVerifyBaseDataField"] = "false", - //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳� - ["Model"] = model - }; - - string result = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨 - //鍒ゆ柇淇濆瓨鏄惁鎴愬姛 - if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") - { - LogService.Write("鏉ユ枡妫�楠屽崟淇濆瓨閿欒jsonRoot:" + jsonRoot); - oCN.RollBack(); - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍚屾閲戣澏浜戝け璐ワ紒鍗曞彿:{HBillNo.ToString()}" + jsonRoot; - objJsonResult.data = null; - return objJsonResult; - } - //鎻愪氦瀹℃牳 - string result1 = string.Empty; - string result2 = string.Empty; - var fID = JObject.Parse(result)["Result"]["Id"].ToString(); - var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString(); - var json = new - { - Ids = fID, - }; - - K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/"); - - - - result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 - result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 - if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") - { - string jsonStr = "{" + - " \"FileName\":\"" + HFileName + "\"," + - " \"FormId\":\"QM_InspectBill\"," + - " \"IsLast\":\"true\"," + - " \"InterId\":\"" + HInterID + "\"," + - " \"BillNO\":\"" + HBillNo + "\"," + - " \"AliasFileName\":\"test\"," + - " \"SendByte\":\"" + a + "\"," + - "}"; - - var ret = client.AttachmentUpload(jsonStr); - - - oCN.RollBack(); - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result; - objJsonResult.data = null; - return objJsonResult; - } - - oCN.Commit(); objJsonResult.code = "0"; objJsonResult.count = 1; - objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; - objJsonResult.data = 1; + objJsonResult.Message = "鐢熸垚鍗曟嵁鎴愬姛锛�"; + objJsonResult.data = null; return objJsonResult; } - catch (Exception e) + else { - oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); - objJsonResult.data = null; + objJsonResult.Message = "鐢熸垚鍗曟嵁澶辫触锛�"; + objJsonResult.data = sErrMsg; return objJsonResult; } } diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs index edb20e3..0cbc00b 100644 --- a/WebAPI/Controllers/SellOutController.cs +++ b/WebAPI/Controllers/SellOutController.cs @@ -377,7 +377,7 @@ //閿�鍞嚭搴�/鎵潯鐮�/鐩存帴璋僿ebservice [Route("SellOut/get_CheckTypeByBarCode_Json")] [HttpGet] - public Object get_CheckTypeByBarCode_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_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(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo); string sExpressNumber = ""; @@ -399,6 +399,33 @@ return objJsonResult; } } + + //public object get_CheckTypeByBarCode_Json(string sCode, long sInterID, string HBillType, string sBillNo, string sMaker, long WhID, long SPID, double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, long HOWNERID) + //{ + // string hexpressNumber = ""; + // this.WebSoBar = this.oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, hexpressNumber, ref ClsPub.sErrInfo); + // bool flag = this.WebSoBar == null; + // object result; + // if (flag) + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 0; + // this.objJsonResult.Message = ClsPub.sErrInfo; + // this.objJsonResult.data = null; + // result = this.objJsonResult; + // } + // else + // { + // this.objJsonResult.code = "0"; + // this.objJsonResult.count = 1; + // this.objJsonResult.Message = ClsPub.sErrInfo; + // this.objJsonResult.data = this.oBar; + // result = this.objJsonResult; + // } + // return result; + //} + + /// <summary> /// 杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃 /// </summary> diff --git a/WebAPI/DLL/Newtonsoft.Json.rar b/WebAPI/DLL/Newtonsoft.Json.rar new file mode 100644 index 0000000..fa77229 --- /dev/null +++ b/WebAPI/DLL/Newtonsoft.Json.rar Binary files differ diff --git a/WebAPI/DLL/Newtonsoft.Json/Newtonsoft.Json.dll b/WebAPI/DLL/Newtonsoft.Json/Newtonsoft.Json.dll new file mode 100644 index 0000000..0a91cd7 --- /dev/null +++ b/WebAPI/DLL/Newtonsoft.Json/Newtonsoft.Json.dll Binary files differ diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 108d0d8..6a36202 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -9,79 +9,79 @@ </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> - <publishTime>01/10/2023 16:52:41</publishTime> + <publishTime>03/03/2023 13:34:09</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> - <publishTime>01/10/2023 16:52:41</publishTime> + <publishTime>03/03/2023 13:34:09</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> - <publishTime>12/17/2020 21:32:28</publishTime> + <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> - <publishTime>01/10/2023 16:52:37</publishTime> + <publishTime>03/03/2023 13:34:07</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> - <publishTime>01/10/2023 16:52:37</publishTime> + <publishTime>03/03/2023 13:34:07</publishTime> </File> <File Include="bin/Dapper.dll"> - <publishTime>07/22/2016 14:52:40</publishTime> + <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>11/02/2022 22:02:56</publishTime> <publishTime>11/15/2022 13:55:23</publishTime> - <publishTime>01/10/2023 16:52:27</publishTime> + <publishTime>03/03/2023 13:34:05</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>11/09/2022 16:01:58</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>01/10/2023 16:52:27</publishTime> + <publishTime>03/03/2023 13:34:05</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> - <publishTime>03/22/2022 05:17:26</publishTime> + <publishTime>03/22/2022 13:17:26</publishTime> </File> <File Include="bin/Grpc.Core.Api.pdb"> - <publishTime>03/18/2022 23:39:42</publishTime> + <publishTime>03/19/2022 07:39:42</publishTime> </File> <File Include="bin/Grpc.Core.dll"> - <publishTime>03/22/2022 05:17:20</publishTime> + <publishTime>03/22/2022 13:17:20</publishTime> </File> <File Include="bin/Grpc.Core.pdb"> - <publishTime>03/18/2022 23:39:48</publishTime> + <publishTime>03/19/2022 07:39:48</publishTime> </File> <File Include="bin/grpc_csharp_ext.x64.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/grpc_csharp_ext.x86.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.dll"> - <publishTime>05/08/2021 17:08:30</publishTime> + <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.pdb"> - <publishTime>05/08/2021 17:08:30</publishTime> + <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>08/19/2021 09:43:58</publishTime> + <publishTime>02/07/2023 09:16:49</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -90,99 +90,99 @@ <publishTime>09/20/2018 19:28:34</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.dylib"> - <publishTime>03/18/2022 23:38:44</publishTime> + <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.so"> - <publishTime>03/18/2022 23:38:42</publishTime> + <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> - <publishTime>03/18/2015 17:02:50</publishTime> + <publishTime>03/19/2015 01:02:50</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> - <publishTime>07/25/2012 11:48:56</publishTime> + <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>01/10/2023 16:52:28</publishTime> + <publishTime>03/03/2023 13:34:06</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>01/10/2023 16:52:28</publishTime> + <publishTime>03/03/2023 13:34:06</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> - <publishTime>08/03/2014 20:33:56</publishTime> + <publishTime>08/04/2014 04:33:56</publishTime> </File> <File Include="bin/NPOI.dll"> - <publishTime>10/23/2021 01:07:54</publishTime> + <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OOXML.dll"> - <publishTime>10/23/2021 01:07:56</publishTime> - </File> - <File Include="bin/NPOI.OOXML.pdb"> <publishTime>10/23/2021 09:07:56</publishTime> </File> + <File Include="bin/NPOI.OOXML.pdb"> + <publishTime>10/23/2021 17:07:56</publishTime> + </File> <File Include="bin/NPOI.OpenXml4Net.dll"> - <publishTime>10/23/2021 01:07:54</publishTime> + <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXml4Net.pdb"> - <publishTime>10/23/2021 09:07:54</publishTime> + <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.dll"> - <publishTime>10/23/2021 01:07:54</publishTime> + <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.pdb"> - <publishTime>10/23/2021 09:07:54</publishTime> + <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.pdb"> - <publishTime>10/23/2021 09:07:54</publishTime> + <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> - <publishTime>01/10/2023 16:52:16</publishTime> + <publishTime>03/03/2023 13:34:04</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> - <publishTime>01/10/2023 16:52:16</publishTime> + <publishTime>03/03/2023 13:34:04</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>01/10/2023 16:52:17</publishTime> + <publishTime>03/03/2023 13:34:04</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>01/10/2023 16:52:17</publishTime> + <publishTime>03/03/2023 13:34:04</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/30/2012 22:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>01/10/2023 16:52:26</publishTime> + <publishTime>03/03/2023 13:34:04</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>01/10/2023 16:52:26</publishTime> + <publishTime>03/03/2023 13:34:04</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> - <publishTime>02/15/2015 17:57:08</publishTime> + <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/System.Buffers.dll"> - <publishTime>07/19/2017 10:01:28</publishTime> + <publishTime>07/19/2017 18:01:28</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -206,19 +206,19 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> - <publishTime>08/19/2014 10:03:34</publishTime> + <publishTime>08/19/2014 18:03:34</publishTime> </File> <File Include="bin/System.Memory.dll"> - <publishTime>04/17/2019 16:24:34</publishTime> + <publishTime>04/18/2019 00:24:34</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> - <publishTime>11/28/2018 13:00:36</publishTime> + <publishTime>11/28/2018 21:00:36</publishTime> </File> <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll"> - <publishTime>09/18/2018 19:38:10</publishTime> + <publishTime>09/19/2018 03:38:10</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -227,7 +227,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> - <publishTime>11/28/2018 12:58:44</publishTime> + <publishTime>11/28/2018 20:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -242,37 +242,37 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> - <publishTime>11/28/2018 13:01:26</publishTime> + <publishTime>11/28/2018 21:01:26</publishTime> </File> <File Include="bin/System.Web.Http.dll"> - <publishTime>11/28/2018 13:01:00</publishTime> + <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> - <publishTime>01/28/2015 04:02:18</publishTime> + <publishTime>01/28/2015 12:02:18</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> - <publishTime>02/11/2014 15:26:04</publishTime> + <publishTime>02/11/2014 23:26:04</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> - <publishTime>01/28/2015 04:02:32</publishTime> + <publishTime>01/28/2015 12:02:32</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -281,12 +281,12 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> - <publishTime>11/24/2014 11:18:48</publishTime> + <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> - <publishTime>01/10/2023 16:53:00</publishTime> + <publishTime>03/03/2023 13:34:12</publishTime> </File> <File Include="bin/WebAPI.dll.config"> <publishTime>12/15/2021 17:59:43</publishTime> @@ -294,196 +294,196 @@ <File Include="bin/WebAPI.pdb"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> - <publishTime>01/10/2023 16:53:00</publishTime> + <publishTime>03/03/2023 13:34:12</publishTime> </File> <File Include="bin/WebGrease.dll"> - <publishTime>07/17/2013 17:03:52</publishTime> + <publishTime>07/18/2013 01:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> - <publishTime>11/29/2018 13:26:02</publishTime> + <publishTime>11/29/2018 21:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> - <publishTime>11/29/2018 13:26:30</publishTime> + <publishTime>11/29/2018 21:26:30</publishTime> </File> <File Include="Config/kdapi.config"> - <publishTime>08/19/2022 08:17:39</publishTime> + <publishTime>08/16/2022 22:31:46</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>11/01/2021 09:26:33</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>02/07/2023 09:16:49</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Global.asax"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="grpc_csharp_ext.x64.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="grpc_csharp_ext.x86.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="Index.html"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.dylib"> - <publishTime>03/18/2022 23:38:44</publishTime> + <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.so"> - <publishTime>03/18/2022 23:38:42</publishTime> + <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="packages.config"> - <publishTime>11/29/2022 10:36:46</publishTime> + <publishTime>11/29/2022 08:58:24</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/web.config"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>01/10/2023 11:14:47</publishTime> + <publishTime>02/26/2023 19:50:05</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>01/10/2023 11:14:46</publishTime> + <publishTime>02/26/2023 19:50:04</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>01/10/2023 11:14:48</publishTime> + <publishTime>02/26/2023 19:50:05</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>01/10/2023 11:14:47</publishTime> + <publishTime>02/26/2023 19:50:05</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>01/10/2023 11:14:47</publishTime> + <publishTime>02/26/2023 19:50:05</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>01/10/2023 11:14:46</publishTime> + <publishTime>02/26/2023 19:50:04</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>01/10/2023 11:14:48</publishTime> + <publishTime>02/26/2023 19:50:06</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>01/10/2023 11:14:51</publishTime> + <publishTime>02/26/2023 19:50:04</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>01/10/2023 11:14:50</publishTime> + <publishTime>02/26/2023 19:50:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>01/10/2023 11:14:48</publishTime> + <publishTime>02/26/2023 19:50:06</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>01/10/2023 11:14:50</publishTime> + <publishTime>02/26/2023 19:50:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>01/10/2023 11:14:49</publishTime> + <publishTime>02/26/2023 19:50:06</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>01/10/2023 11:14:48</publishTime> + <publishTime>02/26/2023 19:50:06</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>01/10/2023 11:14:50</publishTime> + <publishTime>02/26/2023 19:50:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>01/10/2023 11:14:49</publishTime> + <publishTime>02/26/2023 19:50:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>01/10/2023 11:14:50</publishTime> + <publishTime>02/26/2023 19:50:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>01/10/2023 11:14:49</publishTime> + <publishTime>02/26/2023 19:50:06</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource"> - <publishTime>01/10/2023 11:14:46</publishTime> + <publishTime>02/26/2023 19:50:08</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>01/10/2023 11:14:51</publishTime> + <publishTime>02/26/2023 19:50:08</publishTime> </File> <File Include="Web References/WebS/Reference.cs"> <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/Reference.map"> - <publishTime>01/10/2023 11:14:41</publishTime> + <publishTime>02/26/2023 19:50:00</publishTime> </File> <File Include="Web References/WebS/WebService1.disco"> <publishTime>12/20/2021 13:19:56</publishTime> @@ -491,10 +491,13 @@ <File Include="Web References/WebS/WebService1.wsdl"> <publishTime>12/20/2021 13:19:56</publishTime> </File> + <File Include="Web References/WebS2/Reference.map"> + <publishTime>02/26/2023 19:52:25</publishTime> + </File> <File Include="Web.config"> <publishTime>11/14/2022 11:24:08</publishTime> <publishTime>11/02/2022 22:03:20</publishTime> - <publishTime>01/10/2023 16:53:09</publishTime> + <publishTime>03/03/2023 13:34:25</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs index c8fd941..91f1e59 100644 --- a/WebAPI/Properties/Settings.Designer.cs +++ b/WebAPI/Properties/Settings.Designer.cs @@ -32,5 +32,15 @@ return ((string)(this["WebAPI_WebS_WebService1"])); } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] + [global::System.Configuration.DefaultSettingValueAttribute("http://localhost:9099/WebService1.asmx")] + public string WebAPI_WebS2_WebService1 { + get { + return ((string)(this["WebAPI_WebS2_WebService1"])); + } + } } } diff --git a/WebAPI/Properties/Settings.settings b/WebAPI/Properties/Settings.settings index d37166d..f252e7b 100644 --- a/WebAPI/Properties/Settings.settings +++ b/WebAPI/Properties/Settings.settings @@ -5,5 +5,8 @@ <Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application"> <Value Profile="(Default)">http://localhost:8098/WebService1.asmx</Value> </Setting> + <Setting Name="WebAPI_WebS2_WebService1" Type="(Web Service URL)" Scope="Application"> + <Value Profile="(Default)">http://localhost:9099/WebService1.asmx</Value> + </Setting> </Settings> </SettingsFile> \ No newline at end of file diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map index 952b627..493bd8a 100644 --- a/WebAPI/Web References/WebS/Reference.map +++ b/WebAPI/Web References/WebS/Reference.map @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Results> - <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:8098/WebService1.asmx?wsdl" filename="WebService1.wsdl" /> - <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:8098/WebService1.asmx?disco" filename="WebService1.disco" /> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://47.96.97.237/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" /> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://47.96.97.237/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" /> </Results> </DiscoveryClientResultsFile> \ No newline at end of file diff --git a/WebAPI/Web References/WebS/WebService1.disco b/WebAPI/Web References/WebS/WebService1.disco index 9475a15..3150354 100644 --- a/WebAPI/Web References/WebS/WebService1.disco +++ b/WebAPI/Web References/WebS/WebService1.disco @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/"> - <contractRef ref="http://localhost:8098/WebService1.asmx?wsdl" docRef="http://localhost:8098/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> - <soap address="http://localhost:8098/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> - <soap address="http://localhost:8098/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> + <contractRef ref="http://47.96.97.237/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://47.96.97.237/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> + <soap address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> + <soap address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> </discovery> \ No newline at end of file diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl index c27315e..4717c43 100644 --- a/WebAPI/Web References/WebS/WebService1.wsdl +++ b/WebAPI/Web References/WebS/WebService1.wsdl @@ -27803,10 +27803,10 @@ </wsdl:binding> <wsdl:service name="WebService1"> <wsdl:port name="WebService1Soap" binding="tns:WebService1Soap"> - <soap:address location="http://localhost:8098/WebService1.asmx" /> + <soap:address location="http://47.96.97.237/WEBS-WMS/WebService1.asmx" /> </wsdl:port> <wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12"> - <soap12:address location="http://localhost:8098/WebService1.asmx" /> + <soap12:address location="http://47.96.97.237/WEBS-WMS/WebService1.asmx" /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file diff --git a/WebAPI/Web References/WebS2/Reference.cs b/WebAPI/Web References/WebS2/Reference.cs new file mode 100644 index 0000000..4a77f53 --- /dev/null +++ b/WebAPI/Web References/WebS2/Reference.cs @@ -0,0 +1,412 @@ +锘�//------------------------------------------------------------------------------ +// <auto-generated> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆� +// 杩愯鏃剁増鏈�:4.0.30319.42000 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋� +// 閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� +// </auto-generated> +//------------------------------------------------------------------------------ + +// +// 姝ゆ簮浠g爜鏄敱 Microsoft.VSDesigner 4.0.30319.42000 鐗堣嚜鍔ㄧ敓鎴愩�� +// +#pragma warning disable 1591 + +namespace WebAPI.WebS2 { + using System; + using System.Web.Services; + using System.Diagnostics; + using System.Web.Services.Protocols; + using System.Xml.Serialization; + using System.ComponentModel; + using System.Data; + + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Web.Services.WebServiceBindingAttribute(Name="WebService1Soap", Namespace="http://tempuri.org/")] + public partial class WebService1 : System.Web.Services.Protocols.SoapHttpClientProtocol { + + private System.Threading.SendOrPostCallback HelloWorldOperationCompleted; + + private System.Threading.SendOrPostCallback get_SaveCLOUDUseNameandPsdOperationCompleted; + + private System.Threading.SendOrPostCallback set_SaveQcStockInCheckBill_NewOperationCompleted; + + private bool useDefaultCredentialsSetExplicitly; + + /// <remarks/> + public WebService1() { + this.Url = global::WebAPI.Properties.Settings.Default.WebAPI_WebS2_WebService1; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; + } + else { + this.useDefaultCredentialsSetExplicitly = true; + } + } + + public new string Url { + get { + return base.Url; + } + set { + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) + && (this.IsLocalFileSystemWebService(value) == false))) { + base.UseDefaultCredentials = false; + } + base.Url = value; + } + } + + public new bool UseDefaultCredentials { + get { + return base.UseDefaultCredentials; + } + set { + base.UseDefaultCredentials = value; + this.useDefaultCredentialsSetExplicitly = true; + } + } + + /// <remarks/> + public event HelloWorldCompletedEventHandler HelloWorldCompleted; + + /// <remarks/> + public event get_SaveCLOUDUseNameandPsdCompletedEventHandler get_SaveCLOUDUseNameandPsdCompleted; + + /// <remarks/> + public event set_SaveQcStockInCheckBill_NewCompletedEventHandler set_SaveQcStockInCheckBill_NewCompleted; + + /// <remarks/> + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/HelloWorld", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string HelloWorld() { + object[] results = this.Invoke("HelloWorld", new object[0]); + return ((string)(results[0])); + } + + /// <remarks/> + public void HelloWorldAsync() { + this.HelloWorldAsync(null); + } + + /// <remarks/> + public void HelloWorldAsync(object userState) { + if ((this.HelloWorldOperationCompleted == null)) { + this.HelloWorldOperationCompleted = new System.Threading.SendOrPostCallback(this.OnHelloWorldOperationCompleted); + } + this.InvokeAsync("HelloWorld", new object[0], this.HelloWorldOperationCompleted, userState); + } + + private void OnHelloWorldOperationCompleted(object arg) { + if ((this.HelloWorldCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.HelloWorldCompleted(this, new HelloWorldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// <remarks/> + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SaveCLOUDUseNameandPsd", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public System.Data.DataSet get_SaveCLOUDUseNameandPsd(long HInterID) { + object[] results = this.Invoke("get_SaveCLOUDUseNameandPsd", new object[] { + HInterID}); + return ((System.Data.DataSet)(results[0])); + } + + /// <remarks/> + public void get_SaveCLOUDUseNameandPsdAsync(long HInterID) { + this.get_SaveCLOUDUseNameandPsdAsync(HInterID, null); + } + + /// <remarks/> + public void get_SaveCLOUDUseNameandPsdAsync(long HInterID, object userState) { + if ((this.get_SaveCLOUDUseNameandPsdOperationCompleted == null)) { + this.get_SaveCLOUDUseNameandPsdOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SaveCLOUDUseNameandPsdOperationCompleted); + } + this.InvokeAsync("get_SaveCLOUDUseNameandPsd", new object[] { + HInterID}, this.get_SaveCLOUDUseNameandPsdOperationCompleted, userState); + } + + private void Onget_SaveCLOUDUseNameandPsdOperationCompleted(object arg) { + if ((this.get_SaveCLOUDUseNameandPsdCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.get_SaveCLOUDUseNameandPsdCompleted(this, new get_SaveCLOUDUseNameandPsdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// <remarks/> + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveQcStockInCheckBill_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public bool set_SaveQcStockInCheckBill_New( + string HZJOrgNumber, + string HMaterNumber, + string HUnitNumber, + double HCheckQty, + double HRightQty, + double HBadQty, + string HCheckResult, + string HSupNumber, + string HUseResult, + long HSeQ, + long HSourceInterID, + long HSourceEntryID, + string HSourceBillNo, + string user, + long HWHID, + long HSPID, + long HSupID, + long HKeeperID, + long HMaterID, + string HSourceBillType, + long HSLInterID, + long HSLEntryID, + string HSLBillNo, + long HSLSeQ, + string HBillNo, + long HInterID, + ref string sErrMsg) { + object[] results = this.Invoke("set_SaveQcStockInCheckBill_New", new object[] { + HZJOrgNumber, + HMaterNumber, + HUnitNumber, + HCheckQty, + HRightQty, + HBadQty, + HCheckResult, + HSupNumber, + HUseResult, + HSeQ, + HSourceInterID, + HSourceEntryID, + HSourceBillNo, + user, + HWHID, + HSPID, + HSupID, + HKeeperID, + HMaterID, + HSourceBillType, + HSLInterID, + HSLEntryID, + HSLBillNo, + HSLSeQ, + HBillNo, + HInterID, + sErrMsg}); + sErrMsg = ((string)(results[1])); + return ((bool)(results[0])); + } + + /// <remarks/> + public void set_SaveQcStockInCheckBill_NewAsync( + string HZJOrgNumber, + string HMaterNumber, + string HUnitNumber, + double HCheckQty, + double HRightQty, + double HBadQty, + string HCheckResult, + string HSupNumber, + string HUseResult, + long HSeQ, + long HSourceInterID, + long HSourceEntryID, + string HSourceBillNo, + string user, + long HWHID, + long HSPID, + long HSupID, + long HKeeperID, + long HMaterID, + string HSourceBillType, + long HSLInterID, + long HSLEntryID, + string HSLBillNo, + long HSLSeQ, + string HBillNo, + long HInterID, + string sErrMsg) { + this.set_SaveQcStockInCheckBill_NewAsync(HZJOrgNumber, HMaterNumber, HUnitNumber, HCheckQty, HRightQty, HBadQty, HCheckResult, HSupNumber, HUseResult, HSeQ, HSourceInterID, HSourceEntryID, HSourceBillNo, user, HWHID, HSPID, HSupID, HKeeperID, HMaterID, HSourceBillType, HSLInterID, HSLEntryID, HSLBillNo, HSLSeQ, HBillNo, HInterID, sErrMsg, null); + } + + /// <remarks/> + public void set_SaveQcStockInCheckBill_NewAsync( + string HZJOrgNumber, + string HMaterNumber, + string HUnitNumber, + double HCheckQty, + double HRightQty, + double HBadQty, + string HCheckResult, + string HSupNumber, + string HUseResult, + long HSeQ, + long HSourceInterID, + long HSourceEntryID, + string HSourceBillNo, + string user, + long HWHID, + long HSPID, + long HSupID, + long HKeeperID, + long HMaterID, + string HSourceBillType, + long HSLInterID, + long HSLEntryID, + string HSLBillNo, + long HSLSeQ, + string HBillNo, + long HInterID, + string sErrMsg, + object userState) { + if ((this.set_SaveQcStockInCheckBill_NewOperationCompleted == null)) { + this.set_SaveQcStockInCheckBill_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveQcStockInCheckBill_NewOperationCompleted); + } + this.InvokeAsync("set_SaveQcStockInCheckBill_New", new object[] { + HZJOrgNumber, + HMaterNumber, + HUnitNumber, + HCheckQty, + HRightQty, + HBadQty, + HCheckResult, + HSupNumber, + HUseResult, + HSeQ, + HSourceInterID, + HSourceEntryID, + HSourceBillNo, + user, + HWHID, + HSPID, + HSupID, + HKeeperID, + HMaterID, + HSourceBillType, + HSLInterID, + HSLEntryID, + HSLBillNo, + HSLSeQ, + HBillNo, + HInterID, + sErrMsg}, this.set_SaveQcStockInCheckBill_NewOperationCompleted, userState); + } + + private void Onset_SaveQcStockInCheckBill_NewOperationCompleted(object arg) { + if ((this.set_SaveQcStockInCheckBill_NewCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.set_SaveQcStockInCheckBill_NewCompleted(this, new set_SaveQcStockInCheckBill_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// <remarks/> + public new void CancelAsync(object userState) { + base.CancelAsync(userState); + } + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { + return false; + } + System.Uri wsUri = new System.Uri(url); + if (((wsUri.Port >= 1024) + && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { + return true; + } + return false; + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + public delegate void HelloWorldCompletedEventHandler(object sender, HelloWorldCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class HelloWorldCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal HelloWorldCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + public delegate void get_SaveCLOUDUseNameandPsdCompletedEventHandler(object sender, get_SaveCLOUDUseNameandPsdCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class get_SaveCLOUDUseNameandPsdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal get_SaveCLOUDUseNameandPsdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public System.Data.DataSet Result { + get { + this.RaiseExceptionIfNecessary(); + return ((System.Data.DataSet)(this.results[0])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + public delegate void set_SaveQcStockInCheckBill_NewCompletedEventHandler(object sender, set_SaveQcStockInCheckBill_NewCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class set_SaveQcStockInCheckBill_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal set_SaveQcStockInCheckBill_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public bool Result { + get { + this.RaiseExceptionIfNecessary(); + return ((bool)(this.results[0])); + } + } + + /// <remarks/> + public string sErrMsg { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[1])); + } + } + } +} + +#pragma warning restore 1591 \ No newline at end of file diff --git a/WebAPI/Web References/WebS2/Reference.map b/WebAPI/Web References/WebS2/Reference.map new file mode 100644 index 0000000..bf8f74d --- /dev/null +++ b/WebAPI/Web References/WebS2/Reference.map @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <Results> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:9099/WebService1.asmx?disco" filename="WebService1.disco" /> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:9099/WebService1.asmx?wsdl" filename="WebService1.wsdl" /> + </Results> +</DiscoveryClientResultsFile> \ No newline at end of file diff --git a/WebAPI/Web References/WebS2/WebService1.disco b/WebAPI/Web References/WebS2/WebService1.disco new file mode 100644 index 0000000..6a0bea5 --- /dev/null +++ b/WebAPI/Web References/WebS2/WebService1.disco @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/"> + <contractRef ref="http://localhost:9099/WebService1.asmx?wsdl" docRef="http://localhost:9099/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> + <soap address="http://localhost:9099/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> + <soap address="http://localhost:9099/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> +</discovery> \ No newline at end of file diff --git a/WebAPI/Web References/WebS2/WebService1.wsdl b/WebAPI/Web References/WebS2/WebService1.wsdl new file mode 100644 index 0000000..62f60d7 --- /dev/null +++ b/WebAPI/Web References/WebS2/WebService1.wsdl @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + <wsdl:types> + <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/"> + <s:element name="HelloWorld"> + <s:complexType /> + </s:element> + <s:element name="HelloWorldResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="HelloWorldResult" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="get_SaveCLOUDUseNameandPsd"> + <s:complexType> + <s:sequence> + <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="get_SaveCLOUDUseNameandPsdResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="get_SaveCLOUDUseNameandPsdResult"> + <s:complexType> + <s:sequence> + <s:element ref="s:schema" /> + <s:any /> + </s:sequence> + </s:complexType> + </s:element> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="set_SaveQcStockInCheckBill_New"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="HZJOrgNumber" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HMaterNumber" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HUnitNumber" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="HCheckQty" type="s:double" /> + <s:element minOccurs="1" maxOccurs="1" name="HRightQty" type="s:double" /> + <s:element minOccurs="1" maxOccurs="1" name="HBadQty" type="s:double" /> + <s:element minOccurs="0" maxOccurs="1" name="HCheckResult" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HSupNumber" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HUseResult" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="HSeQ" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HSourceInterID" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HSourceEntryID" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="user" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HMaterID" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="HSLInterID" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HSLEntryID" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="HSLBillNo" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="HSLSeQ" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="set_SaveQcStockInCheckBill_NewResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="1" maxOccurs="1" name="set_SaveQcStockInCheckBill_NewResult" type="s:boolean" /> + <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + </s:schema> + </wsdl:types> + <wsdl:message name="HelloWorldSoapIn"> + <wsdl:part name="parameters" element="tns:HelloWorld" /> + </wsdl:message> + <wsdl:message name="HelloWorldSoapOut"> + <wsdl:part name="parameters" element="tns:HelloWorldResponse" /> + </wsdl:message> + <wsdl:message name="get_SaveCLOUDUseNameandPsdSoapIn"> + <wsdl:part name="parameters" element="tns:get_SaveCLOUDUseNameandPsd" /> + </wsdl:message> + <wsdl:message name="get_SaveCLOUDUseNameandPsdSoapOut"> + <wsdl:part name="parameters" element="tns:get_SaveCLOUDUseNameandPsdResponse" /> + </wsdl:message> + <wsdl:message name="set_SaveQcStockInCheckBill_NewSoapIn"> + <wsdl:part name="parameters" element="tns:set_SaveQcStockInCheckBill_New" /> + </wsdl:message> + <wsdl:message name="set_SaveQcStockInCheckBill_NewSoapOut"> + <wsdl:part name="parameters" element="tns:set_SaveQcStockInCheckBill_NewResponse" /> + </wsdl:message> + <wsdl:portType name="WebService1Soap"> + <wsdl:operation name="HelloWorld"> + <wsdl:input message="tns:HelloWorldSoapIn" /> + <wsdl:output message="tns:HelloWorldSoapOut" /> + </wsdl:operation> + <wsdl:operation name="get_SaveCLOUDUseNameandPsd"> + <wsdl:input message="tns:get_SaveCLOUDUseNameandPsdSoapIn" /> + <wsdl:output message="tns:get_SaveCLOUDUseNameandPsdSoapOut" /> + </wsdl:operation> + <wsdl:operation name="set_SaveQcStockInCheckBill_New"> + <wsdl:input message="tns:set_SaveQcStockInCheckBill_NewSoapIn" /> + <wsdl:output message="tns:set_SaveQcStockInCheckBill_NewSoapOut" /> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="WebService1Soap" type="tns:WebService1Soap"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="HelloWorld"> + <soap:operation soapAction="http://tempuri.org/HelloWorld" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="get_SaveCLOUDUseNameandPsd"> + <soap:operation soapAction="http://tempuri.org/get_SaveCLOUDUseNameandPsd" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="set_SaveQcStockInCheckBill_New"> + <soap:operation soapAction="http://tempuri.org/set_SaveQcStockInCheckBill_New" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap"> + <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="HelloWorld"> + <soap12:operation soapAction="http://tempuri.org/HelloWorld" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="get_SaveCLOUDUseNameandPsd"> + <soap12:operation soapAction="http://tempuri.org/get_SaveCLOUDUseNameandPsd" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="set_SaveQcStockInCheckBill_New"> + <soap12:operation soapAction="http://tempuri.org/set_SaveQcStockInCheckBill_New" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="WebService1"> + <wsdl:port name="WebService1Soap" binding="tns:WebService1Soap"> + <soap:address location="http://localhost:9099/WebService1.asmx" /> + </wsdl:port> + <wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12"> + <soap12:address location="http://localhost:9099/WebService1.asmx" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file diff --git a/WebAPI/Web.config b/WebAPI/Web.config index 1934def..a88b60e 100644 --- a/WebAPI/Web.config +++ b/WebAPI/Web.config @@ -28,8 +28,9 @@ <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧--> <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�--> <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ--> - <add key="sUrl" value="http://localhost:8098/WebService1.asmx"/> + <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�--> + <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> 娴嬭瘯鏈嶅姟鍣�--> <add key="webpages:Version" value="3.0.0.0" /> <add key="webpages:Enabled" value="false" /> <add key="ClientValidationEnabled" value="true" /> @@ -96,7 +97,7 @@ </basicHttpBinding> </bindings> <client> - <endpoint address="http://localhost:8098/WebService1.asmx" binding="basicHttpBinding" + <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> </client> @@ -105,7 +106,10 @@ <applicationSettings> <WebAPI.Properties.Settings> <setting name="WebAPI_WebS_WebService1" serializeAs="String"> - <value>http://localhost:8098/WebService1.asmx</value> + <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value> + </setting> + <setting name="WebAPI_WebS2_WebService1" serializeAs="String"> + <value>http://localhost:9099/WebService1.asmx</value> </setting> </WebAPI.Properties.Settings> </applicationSettings> diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 0d45260..fbdb912 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -81,6 +81,7 @@ <Private>True</Private> </Reference> <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> @@ -255,6 +256,11 @@ <Content Include="Views\Scripts\jquery.validate.unobtrusive.js" /> <Content Include="Views\Scripts\jquery.validate.unobtrusive.min.js" /> <Content Include="Views\Scripts\modernizr-2.6.2.js" /> + <Content Include="Web References\WebS2\Reference.map"> + <Generator>MSDiscoCodeGenerator</Generator> + <LastGenOutput>Reference.cs</LastGenOutput> + </Content> + <None Include="Web References\WebS2\WebService1.disco" /> <Content Include="Web References\WebS\ClsCLD_Customer_Model.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> @@ -312,10 +318,11 @@ <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> - <Content Include="Web References\WebS\Reference.map"> + <None Include="Web References\WebS\Reference.map"> <Generator>MSDiscoCodeGenerator</Generator> <LastGenOutput>Reference.cs</LastGenOutput> - </Content> + </None> + <None Include="Web References\WebS2\WebService1.wsdl" /> <None Include="Web References\WebS\WebService1.disco" /> <Content Include="Web.config"> <SubType>Designer</SubType> @@ -871,6 +878,11 @@ <Compile Include="Models\JsonResult.cs" /> <Compile Include="Models\Pensen.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Web References\WebS2\Reference.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Reference.map</DependentUpon> + </Compile> <Compile Include="Web References\WebS\Reference.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> @@ -1027,10 +1039,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx"> + <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx"> <UrlBehavior>Dynamic</UrlBehavior> <RelPath>Web References\WebS\</RelPath> - <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL> + <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL> <ServiceLocationURL> </ServiceLocationURL> <CachedDynamicPropName> @@ -1038,6 +1050,17 @@ <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName> <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName> </WebReferenceUrl> + <WebReferenceUrl Include="http://localhost:9099/WebService1.asmx"> + <UrlBehavior>Dynamic</UrlBehavior> + <RelPath>Web References\WebS2\</RelPath> + <UpdateFromURL>http://localhost:9099/WebService1.asmx</UpdateFromURL> + <ServiceLocationURL> + </ServiceLocationURL> + <CachedDynamicPropName> + </CachedDynamicPropName> + <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName> + <CachedSettingsPropName>WebAPI_WebS2_WebService1</CachedSettingsPropName> + </WebReferenceUrl> </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> -- Gitblit v1.9.1