From a06049a177a20285013c32fba254a09d1cd3cc48 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期三, 11 六月 2025 17:23:38 +0800
Subject: [PATCH] 1.生成出库单逻辑修改（判断是否同一个仓库）
2.入库单接口优化
---
api/WmsSapController.cs | 81 ++++++++--------------------------------
1 files changed, 16 insertions(+), 65 deletions(-)
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index cdc1ded..b85f30f 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -206,7 +206,7 @@
{
#region xml鏁版嵁鎺ユ敹杞暟缁�
- LogHelper.Info("渚涘簲鍟嗘帴鏀舵帴鍙ｏ細" + JsonConvert.SerializeObject(xmlData));
+ //LogHelper.Info("渚涘簲鍟嗘帴鏀舵帴鍙ｏ細" + JsonConvert.SerializeObject(xmlData));
////鎺ユ敹xml鏁版嵁
//XmlDocument xmlDoc = new XmlDocument();
@@ -250,7 +250,7 @@
{
#region xml鏁版嵁鎺ユ敹杞暟缁�
- LogHelper.Info("鐢熶骇璁㈠崟鎺ユ敹鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
+ //LogHelper.Info("鐢熶骇璁㈠崟鎺ユ敹鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
////鎺ユ敹xml鏁版嵁
//XmlDocument xmlDoc = new XmlDocument();
@@ -293,7 +293,7 @@
{
#region xml鏁版嵁鎺ユ敹杞暟缁�
- LogHelper.Info("鐗╂枡鎺ユ敹鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
+ //LogHelper.Info("鐗╂枡鎺ユ敹鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
////鎺ユ敹xml鏁版嵁
//XmlDocument xmlDoc = new XmlDocument();
@@ -338,7 +338,7 @@
public WcReturnRoot.Root WCReceiveXmlData([FromBody] SapRoot.Root xmlData)
{
#region xml鏁版嵁鎺ユ敹杞暟缁�- LogHelper.Info("澶栭噰鏀惰揣鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
+ //LogHelper.Info("澶栭噰鏀惰揣鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
//鎺ユ敹xml鏁版嵁
//XmlDocument xmlDoc = new XmlDocument();
//xmlDoc.LoadXml(xmlData.ToString());
@@ -401,7 +401,7 @@
//NcDto.ROOT rOOT = new NcDto.ROOT();
//rOOT.WLPZ = new NcDto.WLPZ();
- LogHelper.Info("鍐呴噰鏀惰揣鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
+ //LogHelper.Info("鍐呴噰鏀惰揣鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
////鎺ユ敹xmloo
//XmlDocument xmlDoc = new XmlDocument();
@@ -465,35 +465,12 @@
[HttpPost]
public OtherReturnRoot.Root OtherReceiveXmlData([FromBody] otherDto.Root xmlData)
{
- #region xml鏁版嵁鎺ユ敹杞暟缁�- LogHelper.Info("鍏朵粬鍑哄叆搴搒ap鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
-
- ////鎺ユ敹xml鏁版嵁
- //XmlDocument xmlDoc = new XmlDocument();
- //xmlDoc.LoadXml(xmlData.ToString());
-
- //// 灏�XmlDocument 杞崲涓�JSON 瀛楃涓�- //JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
-
- //// 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
- //WmsSpaHelper.EnsureArrayFormat(jsonObject, "ITEM", "ITEM1");
- //// 鍙嶅簭鍒楀寲涓篟ootWithArray
- //var data = JsonConvert.DeserializeObject<otherDto.Root>(jsonObject.ToString());
- #endregion
+
#region 鍏朵粬鍑哄叆搴撲笟鍔℃祦绋� List<SimpleResult> simpleResult = WmsSpaHelper.Otherbound_Order_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;
#endregion
List<OtherReturnRoot.ITEM> wcReturnRoots = new List<OtherReturnRoot.ITEM>();
foreach (var item in simpleResult)
@@ -505,8 +482,6 @@
wcReturnRoot.MSGDESP = item.resultMsg;
wcReturnRoots.Add(wcReturnRoot);
}
- //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg);
- // 瀹屾暣宓屽瀹炰緥鍖� var result = new OtherReturnRoot.Root
{
ROOT = new OtherReturnRoot.ROOT
@@ -613,47 +588,23 @@
[HttpPost]
public LLDReturnRoot.Root LLDReceiveXmlData([FromBody] CKDdto.Root xmlData)
{
- Stopwatch sw = new Stopwatch();
- sw.Start();
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();
#region xml鏁版嵁鎺ユ敹杞暟缁�- LogHelper.Info("鐢熶骇璁㈠崟棰嗘枡鍗�鐢熸垚棰嗘枡鍗�鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
+ //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.EnsureArrayFormat(jsonObject, "ITME");
- //WmsSpaHelper.EnsureArrayFormat(jsonObject["ROOT"]["SCDDLL"] as JObject, "ITEM");
- //// 鍙嶅簭鍒楀寲涓篟ootWithArray
- //var data = JsonConvert.DeserializeObject<CKDdto.Root>(jsonObject.ToString());
+
#endregion
#region 鍑哄簱涓氬姟娴佺▼
- LLDReturnRoot.Root json = WmsSpaHelper.Out_Order_Ins(xmlData);
+ return WmsSpaHelper.Out_Order_Ins(xmlData);
-
- //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
- //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg);
- //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
- List<WcReturnRoot.ITEM> wcReturnRoots = new List<WcReturnRoot.ITEM>();
- sw.Stop();
- long elapsedMilliseconds = sw.ElapsedMilliseconds;
- return json;
+
+ //sw.Stop();
+ //long elapsedMilliseconds = sw.ElapsedMilliseconds;
+ //LogHelper.Info("鐢熶骇璁㈠崟棰嗘枡鍗�鐢熸垚棰嗘枡鍗�杩斿洖鏃堕暱锛� + elapsedMilliseconds);
+
#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;
- //#endregion
}
/// <summary>
--
Gitblit v1.9.1