From 24de88ebbbb3597bb2043840bc685e3d59363967 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 07 七月 2025 16:48:39 +0800
Subject: [PATCH] 优化轮询ERP信息流程、添加AGV接口报文打印、执行中任务强制取消的功能
---
api/ApiModel.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 0b13b6d..07d84eb 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -17,7 +17,8 @@
public List<object> result { get; set; } = new List<object>();
}
- public static SimpleResult NewSimpleResult(int code, string message) {
+ public static SimpleResult BuildSimpleResult(int code, string message) {
+ LogHelper.Info(message);
return new SimpleResult { resultCode = code, resultMsg = message };
}
@@ -39,7 +40,7 @@
}
public class SafetyInteractionInfo {
- public int station_id { get; set; }
+ //public int station_id { get; set; }
/// <summary>
/// 璇锋眰涓婄嚎/涓嬬嚎鐨勭殑绔欏彴搴撲綅鍚嶇О锛屼緥濡倃ork6銆亀ork8
@@ -50,7 +51,7 @@
/// 璇锋眰鐮� /// </summary>
public string apply_code { get; set; }
- public string task_no { set; get; }
+ //public string task_no { set; get; }
}
public class orderStatusReportParme {
@@ -107,6 +108,16 @@
/// 棰濆淇℃伅2
/// </summary>
public string extraInfo2 { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鐢ㄦ埛
+ /// </summary>
+ public string createUser { get; set; }
+
+ /// <summary>
+ /// 鐘舵�鏇存敼鏃堕棿
+ /// </summary>
+ public string statusChangeTime { get; set; }
}
/// <summary>
@@ -115,6 +126,11 @@
public class ReturnResult {
public int ResultCode { get; set; }
public string ResultMsg { get; set; }
+ }
+
+ public class gzResult {
+ public int code { get; set; } = 0;
+ public string msg { get; set; } = "success";
}
/// <summary>
@@ -142,13 +158,32 @@
public string Row { get; set; }
}
+ public class InboundDataInfo {
+ /// <summary>
+ /// 璧风偣璐т綅
+ /// </summary>
+ [JsonProperty("StartLoc")]
+ public string StartLoc { get; set; }
+
+ /// <summary>
+ /// 缁堢偣璐ф灦锛堝彲閫夛級
+ /// </summary>
+ [JsonProperty("Nrow")]
+ public string Row { get; set; }
+
+ public string ItemCode { get; set; }
+ //public string ItemName { get; set; }
+ }
+
public class SelectLocationInfo {
/// <summary>
/// AGV灏忚溅鍙凤細NOTE 鍚庢湡鍙兘鐪佺暐锛屽洜涓哄彧鏈変竴杈嗚溅
/// </summary>
- public string forklift_no { get; set; }
+ //public string forklift_no { get; set; }
- public string endLoc { get; set; }
+ public string TaskNo { get; set; }
+
+ public string EndLoc { get; set; }
}
/// <summary>
@@ -166,6 +201,10 @@
public string endLoc { get; set; }
}
+ public class CancelTaskInfo {
+ public string TaskNo { get; set; }
+ }
+
/// <summary>
/// 浜у搧閮ㄥ垎鍑哄簱淇℃伅
/// </summary>
--
Gitblit v1.9.1