From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
dispatch/NDCApi.cs | 137 +++++++++++++++++----------------------------
1 files changed, 51 insertions(+), 86 deletions(-)
diff --git a/dispatch/NDCApi.cs b/dispatch/NDCApi.cs
index 75cd6ad..5e6a7ee 100644
--- a/dispatch/NDCApi.cs
+++ b/dispatch/NDCApi.cs
@@ -1,28 +1,22 @@
锘縰sing HH.WCS.Mobox3.DSZSH;
using HH.WCS.Mobox3.DSZSH.util;
-
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml;
-namespace HH.WCS.Mobox3.DSZSH.dispatch
-{
+namespace HH.WCS.Mobox3.DSZSH.dispatch {
/// <summary>
- /// NDC鐨凙PI鎺ュ彛锛岀敤浜庢浛浠ｅ師NDC銆丯DCHelper鍜孒ostToAGV妯″潡
+ /// NDC鐨凙PI鎺ュ彛,鐢ㄤ簬鏇夸唬鍘烴DC,NDCHelper鍜孒ostToAGV妯″潡
/// </summary>
- public class NDCApi
- {
+ public class NDCApi {
public static string NDCApiUrl { set; get; }
- static NDCApi()
- {
+ static NDCApi() {
NDCApiUrl = Settings.NdcApiUrl;
}
-
- public static AgvApiResult AddOrderNew(int ts, int pri, string taskNo, List<param> param)
- {
+ public static AgvApiResult AddOrderNew(int ts, int pri, string taskNo, List<param> param) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
var model = new AddOrderNewModel();
@@ -30,33 +24,29 @@
model.pri = pri;
model.task_no = taskNo;
model.param = param;
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{taskNo}涓嬪彂锛寋jsonInfo}", "NDC");
+ LogHelper.Info($"NDC浠诲姟涓嬪彂:{taskNo}\n\n{jsonInfo}\n", "NDC");
var result = httpH.WebPost(NDCApiUrl + "Add", jsonInfo);
- LogHelper.Info($"浠诲姟涓嬪彂缁撴灉res={result}", "NDC");
+ LogHelper.Info($"NDC浠诲姟涓嬪彂缁撴灉:res='{result}'", "NDC");
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
- LogHelper.Info($"浠诲姟涓嬪彂澶辫触 res={e.Message}", "NDC");
+ catch (Exception e) {
+ LogHelper.Info($"浠诲姟涓嬪彂澶辫触:res='{e.Message}'", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
return agvApiResult;
}
}
- public static AgvApiResult AddOrderNew(AddOrderNewModel model)
- {
+ public static AgvApiResult AddOrderNew(AddOrderNewModel model) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{model.task_no}涓嬪彂锛寋jsonInfo}", "NDC");
+ LogHelper.Info($"浠诲姟{model.task_no}涓嬪彂,{jsonInfo}", "NDC");
var result = httpH.WebPost(NDCApiUrl + "Add", jsonInfo);
LogHelper.Info($"浠诲姟涓嬪彂缁撴灉res={result}", "NDC");
@@ -64,8 +54,7 @@
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
+ catch (Exception e) {
LogHelper.Info($"浠诲姟涓嬪彂澶辫触 res={e.Message}", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
@@ -73,17 +62,15 @@
}
}
- public static AgvApiResult CancelOrder(string tsNo, bool is_force = true)
- {
+ public static AgvApiResult CancelOrder(string tsNo, bool is_force = true) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
var model = new CancelOrderModel();
model.task_no = tsNo;
model.is_force = is_force;
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{model.task_no}鍙栨秷锛寋jsonInfo}", "NDC");
+ LogHelper.Info($"浠诲姟{model.task_no}鍙栨秷,{jsonInfo}", "NDC");
var result = httpH.WebPost(NDCApiUrl + "Cancel", jsonInfo);
LogHelper.Info($"浠诲姟{model.task_no}鍙栨秷缁撴灉={result}", "NDC");
@@ -91,8 +78,7 @@
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
+ catch (Exception e) {
LogHelper.Info($"CancelOrder res={e.Message}", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
@@ -100,14 +86,12 @@
}
}
- public static AgvApiResult CancelOrder(CancelOrderModel model)
- {
+ public static AgvApiResult CancelOrder(CancelOrderModel model) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{model.task_no}鍙栨秷锛寋jsonInfo}", "NDC");
+ LogHelper.Info($"浠诲姟{model.task_no}鍙栨秷,{jsonInfo}", "NDC");
var result = httpH.WebPost(NDCApiUrl + "Cancel", jsonInfo);
LogHelper.Info($"浠诲姟{model.task_no}鍙栨秷缁撴灉={result}", "NDC");
@@ -115,8 +99,7 @@
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
+ catch (Exception e) {
LogHelper.Info($"CancelOrder res={e.Message}", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
@@ -125,17 +108,15 @@
}
- public static AgvApiResult ChangeOrderPri(string taskNo, int newPri)
- {
+ public static AgvApiResult ChangeOrderPri(string taskNo, int newPri) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
var model = new ChangePriModel();
model.task_no = taskNo;
model.pri = newPri;
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{model.task_no}浼樺厛绾ф洿鏀癸紝{jsonInfo}", "NDC");
+ LogHelper.Info($"浠诲姟{model.task_no}浼樺厛绾ф洿鏀�{jsonInfo}", "NDC");
var result = httpH.WebPost(NDCApiUrl + "ChangePri", jsonInfo);
LogHelper.Info($"浠诲姟{model.task_no}浼樺厛绾ф洿鏀圭粨鏋�{result}", "NDC");
@@ -143,8 +124,7 @@
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
+ catch (Exception e) {
LogHelper.Info($"ChangeOrderPri res={e.Message}", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
@@ -152,14 +132,12 @@
}
}
- public static AgvApiResult ChangeOrderPri(ChangePriModel model)
- {
+ public static AgvApiResult ChangeOrderPri(ChangePriModel model) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{model.task_no}浼樺厛绾ф洿鏀癸紝{jsonInfo}", "NDC");
+ LogHelper.Info($"浠诲姟{model.task_no}浼樺厛绾ф洿鏀�{jsonInfo}", "NDC");
var result = httpH.WebPost(NDCApiUrl + "ChangePri", jsonInfo);
LogHelper.Info($"浠诲姟{model.task_no}浼樺厛绾ф洿鏀圭粨鏋�{result}", "NDC");
@@ -167,8 +145,7 @@
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
+ catch (Exception e) {
LogHelper.Info($"ChangeOrderPri res={e.Message}", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
@@ -176,18 +153,16 @@
}
}
- public static AgvApiResult ChangeOrderParam(string taskNo, int paramNo, string paramStr)
- {
+ public static AgvApiResult ChangeOrderParam(string taskNo, int paramNo, string paramStr) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
var model = new ChangeParamModel();
model.task_no = taskNo;
model.param_no = paramNo;
model.param = paramStr;
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{model.task_no}鍙傛暟鏇存敼锛寋jsonInfo}", "NDC");
+ LogHelper.Info($"浠诲姟{model.task_no}鍙傛暟鏇存敼,{jsonInfo}", "NDC");
var result = httpH.WebPost(NDCApiUrl + "ChangeParam", jsonInfo);
LogHelper.Info($"浠诲姟{model.task_no}鍙傛暟鏇存敼缁撴灉={result}", "NDC");
@@ -195,8 +170,7 @@
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
+ catch (Exception e) {
LogHelper.Info($"ChangeOrderParam res={e.Message}", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
@@ -204,14 +178,12 @@
}
}
- public static AgvApiResult ChangeOrderParam(ChangeParamModel model)
- {
+ public static AgvApiResult ChangeOrderParam(ChangeParamModel model) {
var httpH = new HttpHelper();
var agvApiResult = new AgvApiResult();
- try
- {
+ try {
string jsonInfo = JsonConvert.SerializeObject(model);
- LogHelper.Info($"浠诲姟{model.task_no}鍙傛暟鏇存敼锛寋jsonInfo}", "NDC");
+ LogHelper.Info($"浠诲姟{model.task_no}鍙傛暟鏇存敼,{jsonInfo}", "NDC");
var result = httpH.WebPost(NDCApiUrl + "ChangeParam", jsonInfo);
LogHelper.Info($"浠诲姟{model.task_no}鍙傛暟鏇存敼缁撴灉={result}", "NDC");
@@ -219,8 +191,7 @@
agvApiResult = JsonConvert.DeserializeObject<AgvApiResult>(result);
return agvApiResult;
}
- catch (Exception e)
- {
+ catch (Exception e) {
LogHelper.Info($"ChangeOrderParam res={e.Message}", "NDC");
agvApiResult.err_code = -1;
agvApiResult.err_msg = e.Message;
@@ -232,43 +203,37 @@
/// <summary>
/// 杩斿洖淇℃伅Model
/// </summary>
- public class AgvApiResult
- {
- public int err_code { set; get; }//寮傚父鐮侊細0 - 姝ｅ父锛屽叾瀹冨�涓哄紓甯搁敊璇爜
- public string err_msg { set; get; }//杩斿洖鐨勯敊璇弿杩帮紝鍦�err_code <> 0 鏃惰繑鍥�- public object result { set; get; }//姝ｇ‘杩斿洖鐨勭粨鏋滃唴瀹癸紝鍦�err_code = 0 涓旀湁杩斿洖鍐呭鏃�+ public class AgvApiResult {
+ public int err_code { set; get; }//寮傚父鐮�0 - 姝ｅ父,鍏跺畠鍊间负寮傚父閿欒鐮�+ public string err_msg { set; get; }//杩斿洖鐨勯敊璇弿杩�鍦�err_code <> 0 鏃惰繑鍥�+ public object result { set; get; }//姝ｇ‘杩斿洖鐨勭粨鏋滃唴瀹�鍦�err_code = 0 涓旀湁杩斿洖鍐呭鏃� }
- public class AddOrderNewModel
- {
- public int ts_no { set; get; }//TS 鍙凤紝蹇呴』鏈夊�
+ public class AddOrderNewModel {
+ public int ts_no { set; get; }//TS 鍙�蹇呴』鏈夊�
public int pri { set; get; }//浼樺厛绾�- public string task_no { set; get; }//涓婃父浠诲姟缂栫爜锛屽鏋�no_feedback = 1 鏃讹紝鍙互涓虹┖
+ public string task_no { set; get; }//涓婃父浠诲姟缂栫爜,濡傛灉 no_feedback = 1 鏃�鍙互涓虹┖
public List<param> param { set; get; } = new List<param>();//鍙傛暟鍒楄〃
}
- public class param
- {
+ public class param {
public string name { set; get; }//鍙傛暟鍚� public string value { set; get; }//鍙傛暟鍊� }
- public class CancelOrderModel
- {
+ public class CancelOrderModel {
public string task_no { set; get; }//涓婃父浠诲姟缂栫爜
- public bool is_force { set; get; } = true;//鏄惁寮哄埗鍙栨秷锛� 鈥�寮哄埗
+ public bool is_force { set; get; } = true;//鏄惁寮哄埗鍙栨秷,1 鈥�寮哄埗
}
- public class ChangeParamModel
- {
+ public class ChangeParamModel {
public string task_no { set; get; }//涓婃父浠诲姟缂栫爜
public int param_no { set; get; }//鍙傛暟鍙�- public string param { set; get; }//鍙傛暟鍐呭锛屽涓弬鏁颁互鑻辨枃鍒嗗彿(;)鍒嗛殧
+ public string param { set; get; }//鍙傛暟鍐呭,澶氫釜鍙傛暟浠ヨ嫳鏂囧垎鍙�;)鍒嗛殧
}
- public class ChangePriModel
- {
+ public class ChangePriModel {
public string task_no { set; get; }//涓婃父浠诲姟缂栫爜
public int pri { set; get; }//鏂颁紭鍏堢骇
}
--
Gitblit v1.9.1