From 28accb402ff845f554493c0e0d6a3e5234d00628 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 11 七月 2025 15:09:57 +0800
Subject: [PATCH] 1
---
HnSx/Build/Project/代码/VS自定义类/AutoThread.cs | 657 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 410 insertions(+), 247 deletions(-)
diff --git "a/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs" "b/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
index b7d15d1..525142b 100644
--- "a/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
+++ "b/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
@@ -120,7 +120,6 @@
/// <param name="action"></param>
public void ThreadSettingInit(Tag tag)
{
- LogHelper.Info("<<<<<<<<<<<<<<<<<<<....Running....>>>>>>>>>>>>>>>");
}
public async void ThreadwebSoc()
@@ -129,18 +128,45 @@
//灏嗘暟鎹紦瀛樺埌鍐呭瓨銆� try
{
+ return;
Thread.Sleep(1000);
while (true)
{
if (/*list.Count > 0 && */WebSocketClientWithReconnect.GetWebSocketState() == WebSocketState.Open)
- for (int i = 60000; i < 70000; i++)
+ for (int i = 0; i < 70000; i++)
{
Thread.Sleep(1000);
- Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>>GGG{i}");
- LogHelper.Info($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>>GGG{i}");
- var b = WebSocketClientWithReconnect.Instance?.SendAsync($"He >>GGG{i}").Result;
- Console.WriteLine("鍙戦�瀹屾垚锛侊紒" + b);
+ Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>>鍙戦� 绗�{i} 鏉�);
+ //LogHelper.Info($"Hello Server {i}");
+ var req = new ReportWeightInfoRequest
+ {
+ data = new ReportWeightInfoData
+ {
+ header = new ReportWeightInfoHeader
+ {
+ deliveryNo = "F0000" + i,
+ grossWeight = i,
+ cube = i,
+ addTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"),
+ addWho = "WCS"
+ }
+ }
+ };
+ var b = WebSocketClientWithReconnect.Instance?.SendAsync(JsonConvert.SerializeObject(req)).Result;
+ Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>鍙戦�瀹屾垚锛侊紒" + b);
+ if (b == true)
+ {
+ // 绛夊緟鐗瑰畾鍝嶅簲
+
+ var rr = reportWeightinfo.GetChinnnl().Result;
+
+ //LogHelper.Info($" {DateTime.Now.ToString("HH:mm:ss.fff")}>> 鎺ユ敹" + JsonConvert.SerializeObject(rr));
+ //}
+ Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>" + JsonConvert.SerializeObject(rr));
+ }
+ else Console.WriteLine("鍙戦�澶辫触銆�);
}
+ Thread.Sleep(1000);
}
}
catch (Exception ex)
@@ -156,13 +182,26 @@
if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
{
Console.WriteLine($"ip= {ip.ToString()}");
- //new HttpServer(ip.ToString()).HttpServerRun();
+ new HttpServer(ip.ToString()).HttpServerRun();
//new TcpServer(ip.ToString());
- //var server = new EnhancedWebSocketServer($"http://{ip.ToString()}:8809/").StartAsync();
- new WebSocketClientWithReconnect($"ws://{ip.ToString()}:8809/socket").StartAsync();
+ //var server = new EnhancedWebSocketServer($"http://{ip.ToString()}:8809/").StartAsync(); http://10.20.66.121:18080
+ //new WebSocketClientWithReconnect($"ws://10.20.66.121:20001/socket").StartAsync();
+ new WebSocketClientWithReconnect($"ws://10.20.66.121:20001/datahubjson/websocket/").StartAsync();
+ //new WebSocketClientWithReconnect($"ws://{ip.ToString()}:8809/socket").StartAsync();
WebSocketClientWithReconnect.Instance.OnMessageReceived += (msg) =>
{
- reportWeightinfo.channel.Writer.TryWrite(JsonConvert.DeserializeObject<ReportWeightInfoResponse>(msg));
+ reportWeightinfo.channel.Writer.TryWrite(msg);
+ //reportWeightinfo.channel.Writer.TryWrite(new ReportWeightInfoResponse
+ //{
+ // Response = new ReportWeightInfoResponseData
+ // {
+ // Return = new ReportWeightInfoReturnInfo
+ // {
+ // returnCode = "0000",
+ // sortingChute = msg
+ // }
+ // }
+ //});
};
break;
}
@@ -180,7 +219,7 @@
public static string _listenerPrefix = "";
public HttpServer(string ip)
{
- _listenerPrefix = $"http://{ip}:8807/";
+ _listenerPrefix = $"http://{ip}:8808/";
}
public void HttpServerRun()
{
@@ -256,33 +295,68 @@
{
switch (path)
{
+ case "/api/Wcs/GetTask":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+ return JsonConvert.SerializeObject(new
+ {
+ 鍑哄叆绉诲簱浠诲姟 = lstr,
+ 绠变綋鍒嗗彂浠诲姟 = putConveyorTasks
+ });
+ break;
+ }
+ case "/api/Wcs/RemoveTask":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+ lstr.RemoveAll(x => x.palletId == requestJson);
+ putConveyorTasks.RemoveAll(x => x.palletId == requestJson);
+ break;
+ }
///浠诲姟涓嬪彂--WMS-->WC
case "/api/Wcs/sendTask":
{
statusCode = System.Net.HttpStatusCode.OK;
var req = JsonConvert.DeserializeObject<SendTaskRequest>(requestJson);
- if (lstr.Find(x => x.PalletId == req.Data.Header.PalletId) != null)
- return JsonConvert.SerializeObject(new SendTaskResponse
- {
- Response = new ResponseData
+ if (req == null || req.data == null || lstr.Find(x => x.groupTaskSequence == req.data.header.groupTaskSequence && x.groupTaskId == req.data.header.groupTaskId) != null)
+ {
+ if (req == null || req.data == null)
+
+ return JsonConvert.SerializeObject(new SendTaskResponse
{
- Return = new ReturnInfo
+ Response = new ResponseData
{
- ReturnCode = "0001",
- ReturnDesc = "鎵樼洏閲嶅涓嬪彂锛侊紒锛�,
- ReturnFlag = "0"
+ Return = new ReturnInfo
+ {
+ returnCode = "0001",
+ returnDesc = req?.data == null ? "鏃犱换鍔′笅鍙戯紒" : "浠诲姟閲嶅涓嬪彂锛�,
+ returnFlag = "0"
+ }
}
- }
- });
+ });
+ else
+ return JsonConvert.SerializeObject(new SendTaskResponse
+ {
+ Response = new ResponseData
+ {
+ Return = new ReturnInfo
+ {
+ returnCode = "0000",
+ returnDesc = "浠诲姟閲嶅涓嬪彂锛�,
+ returnFlag = "1"
+ }
+ }
+ });
+ }
+ lstr.Add(req.data.header);
return JsonConvert.SerializeObject(new SendTaskResponse
{
Response = new ResponseData
{
Return = new ReturnInfo
{
- ReturnCode = "0000",
- ReturnDesc = "ok",
- ReturnFlag = "1"
+ returnCode = "0000",
+ returnDesc = "ok",
+ returnFlag = "1"
}
}
});
@@ -291,54 +365,60 @@
case "/api/Wcs/stockInException":
{
statusCode = System.Net.HttpStatusCode.OK;
- var f = lstr.FirstOrDefault();
- var str = apiHelper.Post("mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new StockInExceptionRequest
+ var f = string.IsNullOrEmpty(requestJson) ? lstr.FirstOrDefault() : lstr.Find(x => x.palletId == requestJson);
+ var str = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=STOCKINEXCEP", JsonConvert.SerializeObject(new StockInExceptionRequest
{
- Data = new StockInExceptionData
+ data = new StockInExceptionData
{
- Header = new StockInExceptionHeader
+ header = new StockInExceptionHeader
{
- OrganizationId = f.OrganizationId,
- WarehouseId = f.WarehouseId,
- GroupTaskId = f.GroupTaskId,
- GroupTaskSequence = f.GroupTaskSequence,
- PalletId = f.PalletId,
- AddTime = f.AddTime,
- AddWho = f.AddWho,
- Reason = "搴撲綅鏈夎揣涓嶅彲鐢�,
- ReasonCode = "01"
+ organizationId = f.organizationId,
+ warehouseId = f.warehouseId,
+ groupTaskId = f.groupTaskId,
+ groupTaskSequence = f.groupTaskSequence,
+ palletId = f.palletId,
+ addTime = f.addTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ addWho = f.addWho,
+ reason = "搴撲綅鏈夎揣涓嶅彲鐢�,
+ reasonCode = "01"
}
}
}));
+
+ var strres = JsonConvert.DeserializeObject<StockInExceptionResponse>(str);
+ if (strres.Response.Return.returnCode == "0000")
+ {
+ f.toPosition = strres.Response.Return.toPosition;
+ f.toLocation = strres.Response.Return.toLocation;
+ }
return str;
}
///浠诲姟鐘舵�鍙嶉 WCS-->WM
case "/api/Wcs/taskFeedback":
{
statusCode = System.Net.HttpStatusCode.OK;
- foreach (var statu in new List<string> { "", "" })
+ //foreach (var statu in new List<string> { "", "" })
{
-
- var f = lstr.FirstOrDefault();
- var str = apiHelper.Post("mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new TaskFeedbackRequest
+ var f = string.IsNullOrEmpty(requestJson) ? lstr.FirstOrDefault() : lstr.Find(x => x.palletId == requestJson);
+ var str = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=TASKFEEDBACK", JsonConvert.SerializeObject(new TaskFeedbackRequest
{
- Data = new TaskFeedbackData
+ data = new TaskFeedbackData
{
- Header = new TaskFeedbackHeader
+ header = new TaskFeedbackHeader
{
- OrganizationId = f.OrganizationId,
- WarehouseId = f.WarehouseId,
- GroupTaskId = f.GroupTaskId,
- GroupTaskSequence = f.GroupTaskSequence,
- PalletId = f.PalletId,
- FmLocation = f.FmLocation,
- FmPosition = f.FmPosition,
- ToLocation = f.ToLocation,
- ToPosition = f.ToPosition,
- TaskStatus = "80",
- TaskType = f.TaskType,
- CloseTime = DateTime.Now,
- CloseWho = f.AddWho
+ organizationId = f.organizationId,
+ warehouseId = f.warehouseId,
+ groupTaskId = f.groupTaskId,
+ groupTaskSequence = f.groupTaskSequence,
+ palletId = f.palletId,
+ fmLocation = f.fmLocation,
+ fmPosition = f.fmPosition,
+ toLocation = f.toLocation,
+ toPosition = f.toPosition,
+ taskStatus = "80",
+ taskType = f.taskType,
+ closeTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ closeWho = f.addWho
}
}
}));
@@ -349,23 +429,97 @@
case "/api/Wcs/stockInInteraction":
{
statusCode = System.Net.HttpStatusCode.OK;
- var str = apiHelper.Post("mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new StockInInteractionRequest
+ var req = JsonConvert.DeserializeObject<StockInInteractionRequest>(requestJson);
+
+ var str = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=STOCKININTERACTION", requestJson);
+ //var str = @"{""Response"":{""return"":{""returnCode"":""0000"",""returnDesc"":""Success"",""returnFlag"":""1"",""groupTaskId"":""GT250708000001"",""groupTaskSequence"":""1"",""taskStatus"":""00"",""taskType"":""PA"",""priority"":""3"",""toLocation"":""5A070101"",""toPosition"":""01""}}}";
+ var res = JsonConvert.DeserializeObject<StockInInteractionResponse>(str);
+ if (res.Response.Return.returnCode == "0000")
{
- Data = new StockInInteractionData
+ var from = req.data.header;
+ var resss = res.Response.Return;
+ lstr.Add(new SendTaskHeader
{
- Header = new StockInInteractionHeader
+ groupTaskId = resss.groupTaskId,
+ groupTaskSequence = resss.groupTaskSequence,
+ fmLocation = from.fmLocation,
+ fmPosition = from.fmPosition,
+ palletId = from.palletId,
+ taskStatus = resss.taskStatus,
+ taskType = resss.taskType,
+ priority = resss.priority,
+ toLocation = resss.toLocation,
+ toPosition = resss.toPosition,
+ addTime = DateTime.Now,
+ addWho = from.addWho,
+ });
+ }
+ return str;// + JsonConvert.SerializeObject(lstr);
+ var str1 = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=STOCKININTERACTION", JsonConvert.SerializeObject(new StockInInteractionRequest
+ {
+ data = new StockInInteractionData
+ {
+ header = new StockInInteractionHeader
{
- PalletId = "TP9901",
- GrossWeight = 99,
- PalletWidth = 99,
- FmLocation = "",
- FmPosition = "",
- AddTime = DateTime.Now,
- AddWho = ""
+ palletId = "TP9901",
+ grossWeight = 99,
+ palletWidth = 99,
+ fmLocation = "",
+ fmPosition = "",
+ addTime = DateTime.Now,
+ addWho = ""
}
}
}));
- return str;
+ return str1;
+ }
+ ///鍏ュ簱浜や簰 銆俉CS-->WMS
+ case "/api/Wcs/stockInInteraction2":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+ var req = JsonConvert.DeserializeObject<StockInInteractionRequest>(requestJson);
+
+ var str = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=STOCKININTERACTION", requestJson);
+ //var str = @"{""Response"":{""return"":{""returnCode"":""0000"",""returnDesc"":""Success"",""returnFlag"":""1"",""groupTaskId"":""GT250708000001"",""groupTaskSequence"":""1"",""taskStatus"":""00"",""taskType"":""PA"",""priority"":""3"",""toLocation"":""5A070101"",""toPosition"":""01""}}}";
+ var res = JsonConvert.DeserializeObject<StockInInteractionResponse>(str);
+ if (res.Response.Return.returnCode == "0000")
+ {
+ var from = req.data.header;
+ var resss = res.Response.Return;
+ lstr.Add(new SendTaskHeader
+ {
+ groupTaskId = resss.groupTaskId,
+ groupTaskSequence = resss.groupTaskSequence,
+ fmLocation = from.fmLocation,
+ fmPosition = from.fmPosition,
+ palletId = from.palletId,
+ taskStatus = resss.taskStatus,
+ taskType = resss.taskType,
+ priority = resss.priority,
+ toLocation = resss.toLocation,
+ toPosition = resss.toPosition,
+ addTime = DateTime.Now,
+ addWho = from.addWho,
+ });
+ }
+ return str;// + JsonConvert.SerializeObject(lstr);
+ var str1 = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=STOCKININTERACTION", JsonConvert.SerializeObject(new StockInInteractionRequest
+ {
+ data = new StockInInteractionData
+ {
+ header = new StockInInteractionHeader
+ {
+ palletId = "TP9901",
+ grossWeight = 99,
+ palletWidth = 99,
+ fmLocation = "",
+ fmPosition = "",
+ addTime = DateTime.Now,
+ addWho = ""
+ }
+ }
+ }));
+ return str1;
}
///浠诲姟鍙栨秷銆�WMS-->WCS
@@ -373,7 +527,7 @@
{
statusCode = System.Net.HttpStatusCode.OK;
var req = JsonConvert.DeserializeObject<CancelTaskRequest>(requestJson);
- var task = lstr.Find(x => x.GroupTaskId == req.Data.Header.GroupTaskId && x.GroupTaskSequence == req.Data.Header.GroupTaskSequence);
+ var task = lstr.Find(x => x.groupTaskId == req.data.header.groupTaskId && x.groupTaskSequence == req.data.header.groupTaskSequence);
if (task == null)
return JsonConvert.SerializeObject(new CancelTaskResponse
{
@@ -381,9 +535,9 @@
{
Return = new ReturnInfo
{
- ReturnCode = "0001",
- ReturnDesc = "浠诲姟涓嶅瓨鍦紒锛侊紒",
- ReturnFlag = "0"
+ returnCode = "0001",
+ returnDesc = "浠诲姟涓嶅瓨鍦紒锛侊紒",
+ returnFlag = "0"
}
}
});
@@ -394,9 +548,9 @@
{
Return = new ReturnInfo
{
- ReturnCode = "0000",
- ReturnDesc = "",
- ReturnFlag = "1"
+ returnCode = "0000",
+ returnDesc = "ok",
+ returnFlag = "1"
}
}
});
@@ -405,18 +559,19 @@
case "/api/Wcs/palletStackerInteraction":
{
statusCode = System.Net.HttpStatusCode.OK;
- var str = apiHelper.Post("mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new PalletStackerInteractionRequest
+
+ var str = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=PALLETSTACKER", !string.IsNullOrEmpty(requestJson) ? requestJson : JsonConvert.SerializeObject(new PalletStackerInteractionRequest
{
- Data = new PalletStackerInteractionData
+ data = new PalletStackerInteractionData
{
- Header = new PalletStackerInteractionHeader
+ header = new PalletStackerInteractionHeader
{
- PalletId = "TP9901",
- TaskId = $"X{DateTime.Now.ToString("yyyy-MM-dd")}001",
- TaskType = "PI",
- FmLocation = "2FC1076",
- AddTime = DateTime.Now,
- AddWho = "wcs"
+ palletId = "TP9901",
+ taskId = $"X{DateTime.Now.ToString("yyyyMMdd")}001",
+ taskType = "PI",
+ fmLocation = "2FC1076",
+ addTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ addWho = "wcs"
}
}
}));
@@ -431,37 +586,37 @@
List<TaskErrorInfo> taskErrorInfos = new List<TaskErrorInfo>();
if (req != null)
{
- foreach (var item in req.Data.Header)
+ foreach (var item in req.data.header)
{
- var task = lstr.Find(x => x.GroupTaskSequence == item.GroupTaskSequence && x.GroupTaskId == item.GroupTaskId);
+ var task = lstr.Find(x => x.groupTaskSequence == item.groupTaskSequence && x.groupTaskId == item.groupTaskId);
if (task != null)
{
- task.Priority = item.Priority;
+ task.priority = item.priority;
}
else
{
taskErrorInfos.Add(new TaskErrorInfo
{
- GroupTaskId = item.GroupTaskId,
- GroupTaskSequence = item.GroupTaskSequence,
- ErrorCode = "0001",
- ErrorDesc = "娌¤繖涓换鍔�
+ groupTaskId = item.groupTaskId,
+ groupTaskSequence = item.groupTaskSequence,
+ errorCode = "0001",
+ errorDesc = "娌¤繖涓换鍔�
});
}
}
}
- if (req == null || req.Data.Header.Count == taskErrorInfos.Count)
+ if (req == null || req.data.header.Count == taskErrorInfos.Count)
return JsonConvert.SerializeObject(new ModifyTaskPriorityResponse
{
Response = new ModifyTaskPriorityResponseData
{
Return = new ModifyTaskPriorityReturnInfo
{
- ReturnCode = "0001",
- ReturnDesc = "娌℃湁浠诲姟鍙洿鏀�,
- ReturnFlag = "0"
+ returnCode = "0001",
+ returnDesc = "娌℃湁浠诲姟鍙洿鏀�,
+ returnFlag = "0"
}
}
});
@@ -474,8 +629,9 @@
{
Return = new ModifyTaskPriorityReturnInfo
{
- ReturnCode = "0000",
- ReturnFlag = "1"
+ returnCode = "0000",
+ returnFlag = "1",
+ returnDesc = "ok"
}
}
});
@@ -487,10 +643,10 @@
{
Return = new ModifyTaskPriorityReturnInfo
{
- ReturnCode = "0001",
- ReturnDesc = "閮ㄥ垎浠诲姟鍙洿鏀�,
- ReturnFlag = "2",
- ResultInfo = taskErrorInfos
+ returnCode = "0001",
+ returnDesc = "閮ㄥ垎浠诲姟鍙洿鏀�,
+ returnFlag = "2",
+ resultInfo = taskErrorInfos
}
}
});
@@ -506,9 +662,9 @@
List<TaskErrorInfo> taskErrorInfos = new List<TaskErrorInfo>();
if (req != null)
{
- foreach (var item in req.Data.Header)
+ foreach (var item in req.data.header)
{
- var task = putConveyorTasks.Find(x => x.GroupTaskSequence == item.GroupTaskSequence && x.GroupTaskId == item.GroupTaskId);
+ var task = putConveyorTasks.Find(x => x.groupTaskSequence == item.groupTaskSequence && x.groupTaskId == item.groupTaskId);
if (task == null)
{
putConveyorTasks.Add(item);
@@ -517,26 +673,25 @@
{
taskErrorInfos.Add(new TaskErrorInfo
{
- GroupTaskId = item.GroupTaskId,
- GroupTaskSequence = item.GroupTaskSequence,
- ErrorCode = "0001",
- ErrorDesc = "閲嶅"
+ groupTaskId = item.groupTaskId,
+ groupTaskSequence = item.groupTaskSequence,
+ errorCode = "0001",
+ errorDesc = "閲嶅"
});
}
}
-
}
- if (req == null || req.Data.Header.Count == taskErrorInfos.Count)
+ if (req == null || req.data.header.Count == taskErrorInfos.Count)
return JsonConvert.SerializeObject(new PutConveyorTaskResponse
{
Response = new PutConveyorTaskResponseData
{
Return = new PutConveyorTaskReturnInfo
{
- ReturnCode = "0001",
- ReturnDesc = "鍏ㄩ儴閲嶅",
- ReturnFlag = "0"
+ returnCode = "0001",
+ returnDesc = "鍏ㄩ儴閲嶅",
+ returnFlag = "0"
}
}
});
@@ -549,8 +704,9 @@
{
Return = new PutConveyorTaskReturnInfo
{
- ReturnCode = "0000",
- ReturnFlag = "1"
+ returnCode = "0000",
+ returnDesc = "ok",
+ returnFlag = "1"
}
}
});
@@ -562,10 +718,10 @@
{
Return = new PutConveyorTaskReturnInfo
{
- ReturnCode = "0001",
- ReturnDesc = "閮ㄥ垎閲嶅",
- ReturnFlag = "2",
- ResultInfo = taskErrorInfos
+ returnCode = "0001",
+ returnDesc = "閮ㄥ垎閲嶅",
+ returnFlag = "2",
+ resultInfo = taskErrorInfos
}
}
});
@@ -583,22 +739,23 @@
//Thread.Sleep(1000);
var req = new ReportWeightInfoRequest
{
- Data = new ReportWeightInfoData
+ data = new ReportWeightInfoData
{
- Header = new ReportWeightInfoHeader
+ header = new ReportWeightInfoHeader
{
- DeliveryNo = "F00001",
- GrossWeight = 99,
- Cube = 66,
- AddTime = DateTime.Now,
- AddWho = "WCS"
+ deliveryNo = "F00001",
+ grossWeight = 99,
+ cube = 66,
+ addTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"),
+ addWho = "WCS"
}
}
};
+ string requeeee = string.IsNullOrEmpty(requestJson) ? JsonConvert.SerializeObject(req) : requestJson;
//Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>>GGG{i}");
- LogHelper.Info(JsonConvert.SerializeObject(req));
- var b = WebSocketClientWithReconnect.Instance?.SendAsync(JsonConvert.SerializeObject(req)).Result;
- Console.WriteLine(req.Data.Header.DeliveryNo + "鍙戦�瀹屾垚锛侊紒" + b);
+ LogHelper.Info(requeeee);
+ var b = WebSocketClientWithReconnect.Instance?.SendAsync(requeeee).Result;
+ Console.WriteLine(req.data.header.deliveryNo + "鍙戦�瀹屾垚锛侊紒" + b);
if (b == true)
{
// 绛夊緟鐗瑰畾鍝嶅簲
@@ -792,7 +949,7 @@
public event Action<string> OnMessageReceived = msg => Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>>Received: {msg}");
public event Action OnConnected = () => Console.WriteLine("Connected to server");
- public event Action OnDisconnected = () => Console.WriteLine("Disconnected from server");
+ public event Action OnDisconnected = () => Console.WriteLine("Disconnected from webSocket server");
public event Action<Exception> OnError = ex => Console.WriteLine($"Error: {ex.Message}");
public WebSocketClientWithReconnect(string serverUrl, int reconnectDelayMs = 5000)
@@ -1347,7 +1504,7 @@
/// <summary>
/// 璇锋眰鏁版嵁
/// </summary>
- public SendTaskData Data { get; set; }
+ public SendTaskData data { get; set; }
}
public class SendTaskData
@@ -1355,7 +1512,7 @@
/// <summary>
/// 璇锋眰澶翠俊鎭� /// </summary>
- public SendTaskHeader Header { get; set; }
+ public SendTaskHeader header { get; set; }
}
public class SendTaskHeader
@@ -1363,72 +1520,72 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 浠诲姟缁勭紪鍙�- 涓婚敭
/// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙�- 涓婚敭
/// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
/// <summary>
/// 鎵樼洏鍙� /// </summary>
- public string PalletId { get; set; }
+ public string palletId { get; set; }
/// <summary>
/// 鏉ユ簮搴撲綅
/// </summary>
- public string FmLocation { get; set; }
+ public string fmLocation { get; set; }
/// <summary>
/// 鏉ユ簮鐐逛綅
/// </summary>
- public string FmPosition { get; set; }
+ public string fmPosition { get; set; }
/// <summary>
/// 鐩爣搴撲綅鍙� /// </summary>
- public string ToLocation { get; set; }
+ public string toLocation { get; set; }
/// <summary>
/// 鐩爣鐐逛綅
/// </summary>
- public string ToPosition { get; set; }
+ public string toPosition { get; set; }
/// <summary>
/// 鐘舵� - 00:鍒涘缓
/// </summary>
- public string TaskStatus { get; set; } = "00";
+ public string taskStatus { get; set; } = "00";
/// <summary>
/// 浠诲姟绫诲瀷 - PA:鍏ュ簱(涓婃灦/鍥炲簱/绉诲簱), PK:鍑哄簱(鎷ｈ揣/绉诲簱/琛ヨ揣/鐩樼偣), MV:鍊掑簱
/// </summary>
- public string TaskType { get; set; }
+ public string taskType { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public DateTime AddTime { get; set; }
+ public DateTime addTime { get; set; }
/// <summary>
/// 鍒涘缓浜� /// </summary>
- public string AddWho { get; set; }
+ public string addWho { get; set; }
/// <summary>
/// 浼樺厛绾�- 1-5(1鏈�珮,5鏈�綆),榛樿3
/// </summary>
- public string Priority { get; set; } = "3";
+ public string priority { get; set; } = "3";
}
@@ -1442,6 +1599,7 @@
public class ResponseData
{
+ [JsonProperty("return")]
public ReturnInfo Return { get; set; }
}
@@ -1450,17 +1608,17 @@
/// <summary>
/// 杩斿洖浠ｇ爜 - 0000:鎴愬姛, 鍏朵粬:澶辫触
/// </summary>
- public string ReturnCode { get; set; }
+ public string returnCode { get; set; }
/// <summary>
/// 杩斿洖鎻忚堪
/// </summary>
- public string ReturnDesc { get; set; }
+ public string returnDesc { get; set; } = "ok";
/// <summary>
/// 杩斿洖鏍囪 - 1:鎴愬姛, 0:澶辫触
/// </summary>
- public string ReturnFlag { get; set; }
+ public string returnFlag { get; set; }
}
}
@@ -1471,12 +1629,12 @@
/// </summary>
public class StockInExceptionRequest
{
- public StockInExceptionData Data { get; set; }
+ public StockInExceptionData data { get; set; }
}
public class StockInExceptionData
{
- public StockInExceptionHeader Header { get; set; }
+ public StockInExceptionHeader header { get; set; }
}
public class StockInExceptionHeader
@@ -1484,47 +1642,47 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 浠诲姟缁勭紪鍙�- 涓婚敭
/// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙�- 涓婚敭
/// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
/// <summary>
/// 鎵樼洏鍙� /// </summary>
- public string PalletId { get; set; }
+ public string palletId { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public DateTime AddTime { get; set; }
+ public string addTime { get; set; }
/// <summary>
/// 鍒涘缓璁惧
/// </summary>
- public string AddWho { get; set; }
+ public string addWho { get; set; }
/// <summary>
/// 寮傚父鍘熷洜鎻忚堪
/// </summary>
- public string Reason { get; set; }
+ public string reason { get; set; }
/// <summary>
/// 寮傚父鍘熷洜浠ｇ爜 - 01:搴撲綅鏈夎揣涓嶅彲鐢� 03:鍏ュ唴浼镐綅澶栦几浣嶆湁璐� /// </summary>
- public string ReasonCode { get; set; }
+ public string reasonCode { get; set; }
// ... UDF瀛楁
}
@@ -1539,6 +1697,7 @@
public class StockInExceptionResponseData
{
+ [JsonProperty("return")]
public StockInExceptionReturnInfo Return { get; set; }
}
@@ -1547,12 +1706,12 @@
/// <summary>
/// 鏂板垎閰嶇殑鐩爣搴撲綅
/// </summary>
- public string ToLocation { get; set; }
+ public string toLocation { get; set; }
/// <summary>
/// 鏂板垎閰嶇殑鐩爣鐐逛綅
/// </summary>
- public string ToPosition { get; set; }
+ public string toPosition { get; set; }
}
}
@@ -1563,12 +1722,12 @@
/// </summary>
public class TaskFeedbackRequest
{
- public TaskFeedbackData Data { get; set; }
+ public TaskFeedbackData data { get; set; }
}
public class TaskFeedbackData
{
- public TaskFeedbackHeader Header { get; set; }
+ public TaskFeedbackHeader header { get; set; }
}
public class TaskFeedbackHeader
@@ -1576,67 +1735,67 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 浠诲姟缁勭紪鍙�- 涓婚敭
/// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙�- 涓婚敭
/// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
/// <summary>
/// 鎵樼洏鍙� /// </summary>
- public string PalletId { get; set; }
+ public string palletId { get; set; }
/// <summary>
/// 鏉ユ簮搴撲綅
/// </summary>
- public string FmLocation { get; set; }
+ public string fmLocation { get; set; }
/// <summary>
/// 鏉ユ簮鐐逛綅
/// </summary>
- public string FmPosition { get; set; }
+ public string fmPosition { get; set; }
/// <summary>
/// 鐩爣搴撲綅鍙� /// </summary>
- public string ToLocation { get; set; }
+ public string toLocation { get; set; }
/// <summary>
/// 鐩爣鐐逛綅
/// </summary>
- public string ToPosition { get; set; }
+ public string toPosition { get; set; }
/// <summary>
/// 鐘舵� - 80:瀹屾垚, 98:寮傚父(鍙栬揣鏃犺揣)
/// </summary>
- public string TaskStatus { get; set; }
+ public string taskStatus { get; set; }
/// <summary>
/// 浠诲姟绫诲瀷 - PA:鍏ュ簱, PK:鍑哄簱, MV:鍊掑簱
/// </summary>
- public string TaskType { get; set; }
+ public string taskType { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
/// </summary>
- public DateTime CloseTime { get; set; }
+ public string closeTime { get; set; }
/// <summary>
/// 瀹屾垚浜哄憳
/// </summary>
- public string CloseWho { get; set; }
+ public string closeWho { get; set; }
// ... UDF瀛楁
}
@@ -1648,12 +1807,12 @@
/// </summary>
public class StockInInteractionRequest
{
- public StockInInteractionData Data { get; set; }
+ public StockInInteractionData data { get; set; }
}
public class StockInInteractionData
{
- public StockInInteractionHeader Header { get; set; }
+ public StockInInteractionHeader header { get; set; }
}
public class StockInInteractionHeader
@@ -1661,47 +1820,47 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 鎵樼洏鍙�- 涓婚敭
/// </summary>
- public string PalletId { get; set; }
+ public string palletId { get; set; }
/// <summary>
/// 鎬婚噸閲�kg)
/// </summary>
- public decimal GrossWeight { get; set; }
+ public decimal grossWeight { get; set; }
/// <summary>
/// 鐮佺洏瀹藉害(cm)
/// </summary>
- public decimal PalletWidth { get; set; }
+ public decimal palletWidth { get; set; }
/// <summary>
/// 鏉ユ簮搴撲綅
/// </summary>
- public string FmLocation { get; set; }
+ public string fmLocation { get; set; }
/// <summary>
/// 鏉ユ簮鐐逛綅
/// </summary>
- public string FmPosition { get; set; }
+ public string fmPosition { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public DateTime AddTime { get; set; }
+ public DateTime addTime { get; set; }
/// <summary>
/// 鍒涘缓浜� /// </summary>
- public string AddWho { get; set; }
+ public string addWho { get; set; }
// ... UDF01-UDF10
}
@@ -1716,6 +1875,7 @@
public class StockInInteractionResponseData
{
+ [JsonProperty("return")]
public StockInInteractionReturnInfo Return { get; set; }
}
@@ -1724,37 +1884,37 @@
/// <summary>
/// 浠诲姟缁勭紪鍙� /// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙� /// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
/// <summary>
/// 鐘舵� - 00:鍒涘缓
/// </summary>
- public string TaskStatus { get; set; }
+ public string taskStatus { get; set; }
/// <summary>
/// 浠诲姟绫诲瀷 - PA:鍏ュ簱
/// </summary>
- public string TaskType { get; set; }
+ public string taskType { get; set; }
/// <summary>
/// 浼樺厛绾�- 1-5(1鏈�珮)
/// </summary>
- public string Priority { get; set; }
+ public string priority { get; set; }
/// <summary>
/// 鐩爣搴撲綅鍙� /// </summary>
- public string ToLocation { get; set; }
+ public string toLocation { get; set; }
/// <summary>
/// 鐩爣鐐逛綅
/// </summary>
- public string ToPosition { get; set; }
+ public string toPosition { get; set; }
}
}
public class cancelTask
@@ -1764,12 +1924,12 @@
/// </summary>
public class CancelTaskRequest
{
- public CancelTaskData Data { get; set; }
+ public CancelTaskData data { get; set; }
}
public class CancelTaskData
{
- public CancelTaskHeader Header { get; set; }
+ public CancelTaskHeader header { get; set; }
}
public class CancelTaskHeader
@@ -1777,22 +1937,22 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 浠诲姟缁勭紪鍙�- 涓婚敭
/// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙�- 涓婚敭
/// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
}
/// <summary>
@@ -1810,12 +1970,12 @@
/// </summary>
public class PalletStackerInteractionRequest
{
- public PalletStackerInteractionData Data { get; set; }
+ public PalletStackerInteractionData data { get; set; }
}
public class PalletStackerInteractionData
{
- public PalletStackerInteractionHeader Header { get; set; }
+ public PalletStackerInteractionHeader header { get; set; }
}
public class PalletStackerInteractionHeader
@@ -1823,47 +1983,47 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 浠诲姟缂栧彿 - 涓婚敭锛岃澶囧彂鍑虹殑璇锋眰ID
/// </summary>
- public string TaskId { get; set; }
+ public string taskId { get; set; }
/// <summary>
/// 鎵樼洏鍙� /// </summary>
- public string PalletId { get; set; }
+ public string palletId { get; set; }
/// <summary>
/// 绫诲瀷 - PI:鍏ュ簱, PT:鍑哄簱(褰撳墠鏃犲嚭搴撳満鏅�
/// </summary>
- public string TaskType { get; set; }
+ public string taskType { get; set; }
/// <summary>
/// 璧峰搴撲綅 - 鍙犵洏鏈虹墿鐞嗚捣濮嬩綅缃� /// </summary>
- public string FmLocation { get; set; }
+ public string fmLocation { get; set; }
/// <summary>
/// 浼樺厛绾�- 1-5(1鏈�珮)
/// </summary>
- public string Priority { get; set; } = "3";
+ public string priority { get; set; } = "3";
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public DateTime AddTime { get; set; }
+ public string addTime { get; set; }
/// <summary>
/// 鍒涘缓璁惧
/// </summary>
- public string AddWho { get; set; }
+ public string addWho { get; set; }
// ... UDF01-UDF10
}
@@ -1884,12 +2044,12 @@
/// </summary>
public class ModifyTaskPriorityRequest
{
- public ModifyTaskPriorityData Data { get; set; }
+ public ModifyTaskPriorityData data { get; set; }
}
public class ModifyTaskPriorityData
{
- public List<ModifyTaskPriorityHeader> Header { get; set; }
+ public List<ModifyTaskPriorityHeader> header { get; set; }
}
public class ModifyTaskPriorityHeader
@@ -1897,27 +2057,27 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 浠诲姟缁勭紪鍙�- 涓婚敭
/// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙�- 涓婚敭
/// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
/// <summary>
/// 浼樺厛绾�- 1-5(1鏈�珮)
/// </summary>
- public string Priority { get; set; }
+ public string priority { get; set; }
}
/// <summary>
@@ -1930,6 +2090,7 @@
public class ModifyTaskPriorityResponseData
{
+ [JsonProperty("return")]
public ModifyTaskPriorityReturnInfo Return { get; set; }
}
@@ -1938,7 +2099,7 @@
/// <summary>
/// 閮ㄥ垎鎴愬姛鏃剁殑閿欒璇︽儏
/// </summary>
- public List<TaskErrorInfo> ResultInfo { get; set; }
+ public List<TaskErrorInfo> resultInfo { get; set; }
}
public class TaskErrorInfo
@@ -1946,22 +2107,22 @@
/// <summary>
/// 浠诲姟缁勭紪鍙� /// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙� /// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
/// <summary>
/// 閿欒浠ｇ爜
/// </summary>
- public string ErrorCode { get; set; }
+ public string errorCode { get; set; }
/// <summary>
/// 閿欒鍘熷洜
/// </summary>
- public string ErrorDesc { get; set; }
+ public string errorDesc { get; set; }
}
}
public class putConveyorTask
@@ -1971,12 +2132,12 @@
/// </summary>
public class PutConveyorTaskRequest
{
- public PutConveyorTaskData Data { get; set; }
+ public PutConveyorTaskData data { get; set; }
}
public class PutConveyorTaskData
{
- public List<PutConveyorTaskHeader> Header { get; set; }
+ public List<PutConveyorTaskHeader> header { get; set; }
}
public class PutConveyorTaskHeader
@@ -1984,42 +2145,42 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 浠诲姟缁勭紪鍙�- 涓婚敭
/// </summary>
- public string GroupTaskId { get; set; }
+ public string groupTaskId { get; set; }
/// <summary>
/// 浠诲姟缁勫簭鍙�- 涓婚敭
/// </summary>
- public int GroupTaskSequence { get; set; }
+ public int groupTaskSequence { get; set; }
/// <summary>
/// 绠卞彿
/// </summary>
- public string PalletId { get; set; }
+ public string palletId { get; set; }
/// <summary>
/// 绠卞瀷 - 澶х/灏忕/鍛ㄨ浆绠辩紪鐮� /// </summary>
- public string PalletIdType { get; set; }
+ public string palletIdType { get; set; }
/// <summary>
/// 璐存爣鏍囪 - Y:闇�璐存爣, N:涓嶉渶瑕� /// </summary>
- public string SyncFlag { get; set; }
+ public string syncFlag { get; set; }
/// <summary>
/// 鐩爣鍖哄煙/閬撳彛 - 鐗╃悊浣嶇疆閬撳彛缂栫爜鎴朆2C澶嶆牳鍙板尯鍩熺紪鐮� /// </summary>
- public string DLocation { get; set; }
+ public string dLocation { get; set; }
// ... UDF01-UDF10
}
@@ -2034,6 +2195,7 @@
public class PutConveyorTaskResponseData
{
+ [JsonProperty("return")]
public PutConveyorTaskReturnInfo Return { get; set; }
}
@@ -2042,14 +2204,14 @@
/// <summary>
/// 閮ㄥ垎鎴愬姛鏃剁殑閿欒璇︽儏
/// </summary>
- public List<TaskErrorInfo> ResultInfo { get; set; }
+ public List<TaskErrorInfo> resultInfo { get; set; }
}
}
public class reportWeightinfo
{
- public static Channel<ReportWeightInfoResponse> channel = Channel.CreateUnbounded<ReportWeightInfoResponse>();
+ public static Channel<string> channel = Channel.CreateUnbounded<string>();
- internal static async Task<ReportWeightInfoReturnInfo> GetChinnnl()
+ internal static async Task<string> GetChinnnl()
{
//var response = await reportWeightinfo.channel.Reader.ReadAllAsync();// foreach (var response in reportWeightinfo.channel.Reader.ReadAllAsync())
//{
@@ -2059,10 +2221,10 @@
{
while (reportWeightinfo.channel.Reader.TryRead(out var response))
{
- return response?.Response?.Return ?? new ReportWeightInfoReturnInfo { ReturnCode = "0001", SortingChute = "0", ReturnDesc = "杩斿洖涓虹┖銆� };
+ return response;/// response?.Response?.Return ?? new ReportWeightInfoReturnInfo { returnCode = "0001", sortingChute = "0", returnDesc = "杩斿洖涓虹┖銆� };
}
}
- return new ReportWeightInfoReturnInfo { ReturnCode = "0001", SortingChute = "0", ReturnDesc = "杩斿洖涓虹┖銆� };
+ return "杩斿洖涓虹┖"; new ReportWeightInfoReturnInfo { returnCode = "0001", sortingChute = "0", returnDesc = "杩斿洖涓虹┖銆� };
}
/// <summary>
@@ -2070,12 +2232,12 @@
/// </summary>
public class ReportWeightInfoRequest
{
- public ReportWeightInfoData Data { get; set; }
+ public ReportWeightInfoData data { get; set; }
}
public class ReportWeightInfoData
{
- public ReportWeightInfoHeader Header { get; set; }
+ public ReportWeightInfoHeader header { get; set; }
}
public class ReportWeightInfoHeader
@@ -2083,37 +2245,37 @@
/// <summary>
/// 缁勭粐缂栧彿 - 涓婚敭锛岄粯璁ERCURY
/// </summary>
- public string OrganizationId { get; set; } = "MERCURY";
+ public string organizationId { get; set; } = "MERCURY";
/// <summary>
/// 浠撳簱缂栧彿 - 涓婚敭锛岄粯璁N02
/// </summary>
- public string WarehouseId { get; set; } = "HN02";
+ public string warehouseId { get; set; } = "HN02";
/// <summary>
/// 闈㈠崟鍙�- 涓婚敭
/// </summary>
- public string DeliveryNo { get; set; }
+ public string deliveryNo { get; set; }
/// <summary>
/// 閲嶉噺(kg)
/// </summary>
- public decimal GrossWeight { get; set; }
+ public decimal grossWeight { get; set; }
/// <summary>
/// 浣撶Н(绔嬫柟鍘樼背)
/// </summary>
- public decimal Cube { get; set; }
+ public decimal cube { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public DateTime AddTime { get; set; }
+ public string addTime { get; set; }
/// <summary>
/// 鍒涘缓璁惧
/// </summary>
- public string AddWho { get; set; }
+ public string addWho { get; set; }
// ... UDF瀛楁
}
@@ -2128,6 +2290,7 @@
public class ReportWeightInfoResponseData
{
+ [JsonProperty("return")]
public ReportWeightInfoReturnInfo Return { get; set; }
}
@@ -2136,7 +2299,7 @@
/// <summary>
/// 鍒嗘嫞閬撳彛 - 杈撻�绾垮揩閫熷垎鎷ｉ亾鍙ｇ紪鐮� /// </summary>
- public string SortingChute { get; set; }
+ public string sortingChute { get; set; }
}
}
--
Gitblit v1.9.1