From 27d187d5834cc6eabc0fba79c13f9d8efd6bec19 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期五, 23 五月 2025 18:12:42 +0800
Subject: [PATCH] 1.内采出库流程报错测试 2.称重算法逻辑优化
---
api/WmsSapController.cs | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index 89471e8..a504c9e 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -23,47 +23,47 @@
public class WmsSapController : System.Web.Http.ApiController
{
/// <summary>
- /// 鐢熶骇璁㈠崟淇℃伅鑾峰彇
+ /// 渚涘簲鍟嗘帴鏀舵帴鍙ｈ幏鍙� /// </summary>
/// <param name="xmlData"></param>
/// <returns></returns>
- //[HttpPost]
- //public Orderback.Root GYSReceiveXmlData([FromBody] GYSDto.Root xmlData)
- //{
- // #region xml鏁版嵁鎺ユ敹杞暟缁�+ [HttpPost]
+ public GYSReturnRoot.Root GYSReceiveXmlData([FromBody] GYSDto.Root xmlData)
+ {
+ #region xml鏁版嵁鎺ユ敹杞暟缁�
- // LogHelper.Info("渚涘簲鍟嗘帴鏀舵帴鍙ｏ細" + JsonConvert.SerializeObject(xmlData));
+ LogHelper.Info("渚涘簲鍟嗘帴鏀舵帴鍙ｏ細" + JsonConvert.SerializeObject(xmlData));
- // ////鎺ユ敹xml鏁版嵁
- // //XmlDocument xmlDoc = new XmlDocument();
- // //xmlDoc.LoadXml(xmlData.ToString());
+ ////鎺ユ敹xml鏁版嵁
+ //XmlDocument xmlDoc = new XmlDocument();
+ //xmlDoc.LoadXml(xmlData.ToString());
- // //// 灏�XmlDocument 杞崲涓�JSON 瀛楃涓�- // //JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+ //// 灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+ //JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
- // //// 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
- // //WmsSpaHelper.EnsureArrayFormats(jsonObject, "ITEM");
- // //// 鍙嶅簭鍒楀寲涓篟ootWithArray
- // //var data = JsonConvert.DeserializeObject<OrderDto.Root>(jsonObject.ToString());
- // #endregion
+ //// 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+ //WmsSpaHelper.EnsureArrayFormats(jsonObject, "ITEM");
+ //// 鍙嶅簭鍒楀寲涓篟ootWithArray
+ //var data = JsonConvert.DeserializeObject<OrderDto.Root>(jsonObject.ToString());
+ #endregion
- // #region 澶栭噰鍏ュ簱涓氬姟娴佺▼
- // //Orderback.Root simpleResult = WmsSpaHelper.Mater_In(xmlData);
- // //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
- // //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg);
+ #region 澶栭噰鍏ュ簱涓氬姟娴佺▼
+ GYSReturnRoot.Root simpleResult = WmsSpaHelper.GYS_In(xmlData);
+ //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
+ //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg);
- // #endregion
- // #region 杩斿洖xml
- // //string xml = JsonConvert.DeserializeXmlNode(json, "root").OuterXml;
- // ////杩斿洖json
- // //var response = new HttpResponseMessage()
- // //{
- // // Content = new StringContent(xml, Encoding.UTF8, "application/xml")
- // //};
- // //return response;
- // return null;
- // #endregion
- //}
+ #endregion
+ #region 杩斿洖xml
+ //string xml = JsonConvert.DeserializeXmlNode(json, "root").OuterXml;
+ ////杩斿洖json
+ //var response = new HttpResponseMessage()
+ //{
+ // Content = new StringContent(xml, Encoding.UTF8, "application/xml")
+ //};
+ //return response;
+ return simpleResult;
+ #endregion
+ }
/// <summary>
@@ -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
}
@@ -368,6 +370,16 @@
return WmsSpaHelper.OutboundOrderSorting(model);
}
+ /// <summary>
+ /// 绌烘墭鍑哄叆搴�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public Task<SimpleResult> InOutKT(KtSorting model)
+ {
+ return WmsSpaHelper.KtSorting(model);
+ }
/// <summary>
--
Gitblit v1.9.1