From 6ed44f32c96a17fd10601a24c3c36ca1229bc89b Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 17 七月 2025 17:18:12 +0800
Subject: [PATCH] 优化货位绑定图片链接保存逻辑，删除不使用的代码
---
api/ApiModel.cs | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 17 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 0b13b6d..464de7c 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,10 +51,11 @@
/// 璇锋眰鐮� /// </summary>
public string apply_code { get; set; }
- public string task_no { set; get; }
+ //public string task_no { set; get; }
}
public class orderStatusReportParme {
+ public int id { get; set; }
/// <summary>
/// 璁㈠崟ID
/// </summary>
@@ -87,17 +89,6 @@
/// 閿欒鐮� /// </summary>
public int errorCode { get; set; }
-
- /// <summary>
- /// 璁㈠崟鐨勬埅鑷虫椂闂�- /// </summary>
- public string deadLine { get; set; }
-
- /// <summary>
- /// 璁㈠崟鐨勫垱寤烘椂闂�- /// </summary>
- public string createdTime { get; set; }
-
/// <summary>
/// 棰濆淇℃伅1
/// </summary>
@@ -107,6 +98,24 @@
/// 棰濆淇℃伅2
/// </summary>
public string extraInfo2 { get; set; }
+ /// <summary>
+ /// 璁㈠崟鐨勬埅鑷虫椂闂�+ /// </summary>
+ public string deadLine { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鐨勫垱寤烘椂闂�+ /// </summary>
+ public string createdTime { get; set; }
+ /// <summary>
+ /// 鍒涘缓鐢ㄦ埛
+ /// </summary>
+ public string createUser { get; set; }
+
+ /// <summary>
+ /// 鐘舵�鏇存敼鏃堕棿
+ /// </summary>
+ public string statusChangeTime { get; set; }
}
/// <summary>
@@ -117,6 +126,11 @@
public string ResultMsg { get; set; }
}
+ public class gzResult {
+ public int code { get; set; } = 0;
+ public string msg { get; set; } = "success";
+ }
+
/// <summary>
/// 杩斿洖缁橤Z
/// </summary>
@@ -124,6 +138,30 @@
public int resultCode { get; set; }
public string msg { get; set; }
public int orderID { get; set; }
+ }
+
+ public class EmptyGzResult {
+
+ }
+
+ public class agvRealtimeStateReportInfo {
+ public int agvID { get; set; }
+ public int agvStatusID { get; set; }
+ public bool netConnected { get; set; }
+ public string agv_speed { get; set; }
+ public object node_information_of_traffic { get; set; }
+ public int dispatchTaskActive { get; set; }
+ public double position_x { get; set; }
+ public double position_y { get; set; }
+ public double angle { get; set; }
+ public double battery_percentage { get; set; }
+ public double safetyTriggered { get; set; }
+ public bool isBlocked { get; set; }
+ public bool faultHappened { get; set; }
+ public bool isCharging { get; set; }
+ public bool hang_agv { get; set; }
+ public string extroInfo1 { get; set; }
+ public string extroInfo2 { get; set; }
}
}
@@ -142,13 +180,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>
@@ -164,6 +221,10 @@
/// 缁堢偣浣嶇疆
/// </summary>
public string endLoc { get; set; }
+ }
+
+ public class CancelTaskInfo {
+ public string TaskNo { get; set; }
}
/// <summary>
@@ -191,8 +252,14 @@
}
public class CountProductInfo {
- public string cntrCode { get; set; }
+ //public string cntrCode { get; set; }
+ public string locCode { get; set; }
public float qty { get; set; }
+ }
+
+ public class CheckOutboundOnceInfo {
+ public string cntrCode { get; set; }
+ public string endLoc { get; set; }
}
/// <summary>
@@ -477,5 +544,9 @@
/// </summary>
public string ext5 { get; set; }
}
+
+ public class KanbanAgvState {
+ public string AgvState { get; set; }
+ }
}
}
--
Gitblit v1.9.1