From 8a4a084602b591c10156213b090daf47536b6066 Mon Sep 17 00:00:00 2001 From: hudong <Administrator@PC-20250329JZUF> Date: 星期一, 19 五月 2025 17:12:29 +0800 Subject: [PATCH] 1.生产订单流程联调完成 2.外采入库124逻辑修改,代码优化 3.物料凭证逻辑优化 --- api/WmsSapController.cs | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs index 8c0fbd4..c917d18 100644 --- a/api/WmsSapController.cs +++ b/api/WmsSapController.cs @@ -23,12 +23,12 @@ public class WmsSapController : System.Web.Http.ApiController { /// <summary> - /// 鐢熶骇璁㈠崟淇℃伅鑾峰彇 + /// 渚涘簲鍟嗘帴鏀舵帴鍙h幏鍙� /// </summary> /// <param name="xmlData"></param> /// <returns></returns> [HttpPost] - public Orderback.Root GYSReceiveXmlData([FromBody] GYSDto.Root xmlData) + public GYSReturnRoot.Root GYSReceiveXmlData([FromBody] GYSDto.Root xmlData) { #region xml鏁版嵁鎺ユ敹杞暟缁� @@ -48,7 +48,7 @@ #endregion #region 澶栭噰鍏ュ簱涓氬姟娴佺▼ - //Orderback.Root simpleResult = WmsSpaHelper.Mater_In(xmlData); + GYSReturnRoot.Root simpleResult = WmsSpaHelper.GYS_In(xmlData); //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡 //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg); @@ -61,7 +61,7 @@ // Content = new StringContent(xml, Encoding.UTF8, "application/xml") //}; //return response; - return null; + return simpleResult; #endregion } @@ -115,7 +115,7 @@ /// <returns></returns> [HttpPost] - public SimpleResult MaterReceiveXmlData([FromBody] MaterDto.Root xmlData) + public WLReturnRoot.Root MaterReceiveXmlData([FromBody] MaterDto.Root xmlData) { #region xml鏁版嵁鎺ユ敹杞暟缁� @@ -135,7 +135,7 @@ #endregion #region 澶栭噰鍏ュ簱涓氬姟娴佺▼ - SimpleResult simpleResult = WmsSpaHelper.Mater_In(xmlData); + WLReturnRoot.Root simpleResult = WmsSpaHelper.Mater_In(xmlData); //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡 //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg); @@ -148,6 +148,8 @@ // Content = new StringContent(xml, Encoding.UTF8, "application/xml") //}; //return response; + + var json = JsonConvert.SerializeObject(simpleResult); return simpleResult; #endregion } -- Gitblit v1.9.1