From 67c7f0449f57933c26d785c277ddcd539c899b25 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期五, 04 七月 2025 17:39:39 +0800
Subject: [PATCH] 出库审核逻辑修改
---
api/WmsSapController.cs | 62 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index b85f30f..de39f0d 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -291,37 +291,11 @@
[HttpPost]
public WLReturnRoot.Root MaterReceiveXmlData([FromBody] MaterDto.Root xmlData)
{
- #region xml鏁版嵁鎺ユ敹杞暟缁�-
- //LogHelper.Info("鐗╂枡鎺ユ敹鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
-
- ////鎺ユ敹xml鏁版嵁
- //XmlDocument xmlDoc = new XmlDocument();
- //xmlDoc.LoadXml(xmlData.ToString());
-
- //// 灏�XmlDocument 杞崲涓�JSON 瀛楃涓�- //JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
-
- //// 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
- //WmsSpaHelper.EnsureArrayFormats(jsonObject, "ITEM");
- //// 鍙嶅簭鍒楀寲涓篟ootWithArray
- //var data = JsonConvert.DeserializeObject<MaterDto.Root>(jsonObject.ToString());
- #endregion
+
#region 澶栭噰鍏ュ簱涓氬姟娴佺▼
WLReturnRoot.Root simpleResult = WmsSpaHelper.Mater_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;
+
var json = JsonConvert.SerializeObject(simpleResult);
return simpleResult;
@@ -509,6 +483,17 @@
}
/// <summary>
+ /// pda鍒嗘嫞瀹屾暣鐗�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public Task<SimpleResult> AllOutboundOrderSorting(FJSorting model)
+ {
+ return WmsSpaHelper.ALLOutboundOrderSorting(model);
+ }
+
+ /// <summary>
/// pda鍒嗘嫞
/// </summary>
/// <param name="model"></param>
@@ -518,7 +503,16 @@
{
return WmsSpaHelper.OutboundOrderSorting(model);
}
-
+ /// <summary>
+ /// 鍥炲簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public Task<SimpleResult> HkGet(HuiK model)
+ {
+ return WmsSpaHelper.HkGets(model);
+ }
/// <summary>
/// 绌烘墭鍑哄叆搴� /// </summary>
@@ -593,17 +587,17 @@
#region xml鏁版嵁鎺ユ敹杞暟缁� //LogHelper.Info("鐢熶骇璁㈠崟棰嗘枡鍗�鐢熸垚棰嗘枡鍗�鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
-
+
#endregion
#region 鍑哄簱涓氬姟娴佺▼
- return WmsSpaHelper.Out_Order_Ins(xmlData);
+ return WmsSpaHelper.Out_Order_Ins(xmlData);
-
+
//sw.Stop();
//long elapsedMilliseconds = sw.ElapsedMilliseconds;
//LogHelper.Info("鐢熶骇璁㈠崟棰嗘枡鍗�鐢熸垚棰嗘枡鍗�杩斿洖鏃堕暱锛� + elapsedMilliseconds);
-
+
#endregion
}
@@ -618,7 +612,7 @@
{
- var json = WmsSpaHelper.Out_Order_Inss(dto.S_NO);
+ var json = WmsSpaHelper.Out_Order_Inss(dto.S_NO,dto.N_PRIORITY);
return json;
--
Gitblit v1.9.1