From 17c1c9bb4537f3915e5b53e1a26a1a0b9c8e7c85 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 16 六月 2025 08:37:58 +0800
Subject: [PATCH] 1.定时充电问题排查，增加状态字段增加定时更新状态2.删除webservice所有日志 api接口日志（超时问题优化）
---
api/WmsSapController.cs | 137 ++++++++++++++++-----------------------------
1 files changed, 48 insertions(+), 89 deletions(-)
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index ea23188..f97141d 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -20,17 +20,46 @@
using static HH.WCS.Mobox3.pinggao.models.DAPING;
using HH.WCS.Mobox3.pinggao.util;
using SqlSugar;
+using System.Diagnostics;
namespace HH.WCS.Mobox3.pinggao.api
{
public class WmsSapController : System.Web.Http.ApiController
{
-
- #region 澶у睆鏁版嵁鎺ュ彛
/// <summary>
- /// 澶у睆鏁版嵁
+ /// 鍑哄韩浠诲嫏鍒楄〃
/// </summary>
/// <returns></returns>
+ public DPList DpRecord(DpDto dpDto)
+ {
+ var response = new DPList
+ {
+ DpList = new List<DP> { }
+ };
+ if (string.IsNullOrEmpty(dpDto.Code))
+ {
+ LogHelper.Info("璐т綅淇℃伅涓嶈兘涓虹┖" );
+ return response;
+ }
+ var db = new SqlHelper<object>().GetInstance();
+ var list =db.Queryable<TN_DPRECORD>().Where(s=>s.S_LOCATION== dpDto.Code).OrderByDescending(s=>s.T_CREATE).ToList();
+ var tasksList = list.Select(t => new DP
+ {
+ S_NO = t.S_NO,
+ S_WLBM = t.S_WLBM,
+ S_WLMC = t.S_WLMC,
+ N_COUNT = t.N_COUNT,
+ S_LOCATION = t.S_LOCATION
+ }).ToList();
+ response.DpList = tasksList;
+ return response;
+
+ }
+ #region 澶у睆鏁版嵁鎺ュ彛
+ /// <summary>
+ /// 澶у睆鏁版嵁
+ /// </summary>
+ /// <returns></returns>
public BarChartResponse InOut(){
var response = new BarChartResponse
@@ -177,7 +206,7 @@
{
#region xml鏁版嵁鎺ユ敹杞暟缁�
- LogHelper.Info("渚涘簲鍟嗘帴鏀舵帴鍙ｏ細" + JsonConvert.SerializeObject(xmlData));
+ //LogHelper.Info("渚涘簲鍟嗘帴鏀舵帴鍙ｏ細" + JsonConvert.SerializeObject(xmlData));
////鎺ユ敹xml鏁版嵁
//XmlDocument xmlDoc = new XmlDocument();
@@ -221,7 +250,7 @@
{
#region xml鏁版嵁鎺ユ敹杞暟缁�
- LogHelper.Info("鐢熶骇璁㈠崟鎺ユ敹鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
+ //LogHelper.Info("鐢熶骇璁㈠崟鎺ユ敹鎺ュ彛锛� + JsonConvert.SerializeObject(xmlData));
////鎺ユ敹xml鏁版嵁
//XmlDocument xmlDoc = new XmlDocument();
@@ -262,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;
@@ -309,7 +312,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());
@@ -372,7 +375,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();
@@ -436,35 +439,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)
@@ -476,8 +456,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
@@ -584,42 +562,23 @@
[HttpPost]
public LLDReturnRoot.Root LLDReceiveXmlData([FromBody] CKDdto.Root xmlData)
{
+ //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);
- //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
- //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg);
- //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
- List<WcReturnRoot.ITEM> wcReturnRoots = new List<WcReturnRoot.ITEM>();
+ return WmsSpaHelper.Out_Order_Ins(xmlData);
- 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