From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Model/InterFaceModel/HttpModel.cs | 84 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 8882911..c4b9322 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -121,7 +121,7 @@
public string TaskNo { get; set; }
/// <summary>
- /// 浠诲姟绫诲瀷
+ /// 浠诲姟绫诲瀷 0锛氬叆搴擄紝1锛氬嚭搴擄紝2:绉诲簱锛�3锛氬叆搴撹９鍖�
/// </summary>
public string TaskType { get; set; }
@@ -379,7 +379,7 @@
/// 鏍煎紡: 鈥測yyy-MM-ddHH:mm:ss鈥�
/// 鏄惁蹇呭～锛氬惁
/// </summary>
- public string EeqTime { get; set; }
+ public string ReqTime { get; set; }
/// <summary>
/// 瀹㈡埛绔紪鍙凤紝濡� PDA锛孒CWMS 绛夈��
@@ -422,6 +422,13 @@
/// 鏄惁蹇呭～锛氬惁
/// </summary>
public string CtnrTyp { get; set; }
+
+ /// <summary>
+ /// 瀹瑰櫒鏁伴噺锛堝弶杞�/CTU 涓撶敤锛�
+ /// 鍙夎溅椤圭洰蹇呬紶
+ /// 鏄惁蹇呭～锛氬惁
+ /// </summary>
+ public string CtnrNum { get; set; }
/// <summary>
/// 瀹瑰櫒缂栧彿锛堝弶杞�/CTU 涓撶敤锛�
@@ -665,6 +672,7 @@
/// </summary>
public class AgvTaskDto
{
+
/// <summary>
/// 璇锋眰缂栧彿锛屾瘡涓姹傞兘瑕佷竴涓敮涓�缂栧彿
/// 鍚屼竴涓姹傞噸澶嶆彁浜� 浣跨敤鍚屼竴缂栧彿
@@ -683,13 +691,13 @@
/// 鍦扮爜 X 鍧愭爣(mm)锛氫换鍔″畬鎴愭椂鏈夊��
/// 鏄惁蹇呭～锛氬惁
/// </summary>
- public int CooX { get; set; }
+ public decimal CooX { get; set; }
/// <summary>
/// 鍦扮爜 Y 鍧愭爣(mm)锛氫换鍔″畬鎴愭椂鏈夊��
/// 鏄惁蹇呭～锛氬惁
/// </summary>
- public int CooY { get; set; }
+ public decimal CooY { get; set; }
/// <summary>
/// 褰撳墠浣嶇疆缂栧彿
@@ -785,11 +793,6 @@
/// </summary>
public string CtnrCode { get; set; }
- /// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// 鏄惁蹇呭～锛氬惁
- /// </summary>
- public string CtnrType { get; set; }
/// <summary>
/// 宸烽亾缂栧彿
@@ -809,6 +812,40 @@
/// 鏄惁蹇呭～锛氬惁
/// </summary>
public string EqpCode { get; set; }
+ public string DstBinCode { get; set; }
+ public string IndBind { get; set; }
+ public string Layer { get; set; }
+ public string MapShortName { get; set; }
+ public string MaterialType { get; set; }
+
+ public string Action { get; set; }
+ public string AreaCode { get; set; }
+
+ public string BerthCode { get; set; }
+
+
+
+ public string CallCode { get; set; }
+
+ public string CallTyp { get; set; }
+ public string ClientCode { get; set; }
+ public string OrgCode { get; set; }
+ public string CtnrTyp { get; set; }
+ public string CurrentCallCode { get; set; }
+
+ public string PodCode { get; set; }
+
+ public string PodTyp { get; set; }
+ public string PodNum { get; set; }
+ public string RelatedArea { get; set; }
+ public string ReqTime { get; set; }
+ public string SubTaskNum { get; set; }
+
+ public string TaskTyp { get; set; }
+
+ public string TokenCode { get; set; }
+ public string Username { get; set; }
+ public string WhCode { get; set; }
}
/// <summary>
@@ -845,6 +882,35 @@
/// </summary>
public string Data { get; set; }
}
+
+ /// <summary>
+ /// WMS涓嬪彂AGV鍙栨秷浠诲姟鍥炰紶鍙傛暟
+ /// </summary>
+ public class cancelTaskModel
+ {
+ /// <summary>
+ /// 杩斿洖鐮�
+ /// 0锛氭垚鍔�
+ /// 1锛氬弬鏁扮浉鍏崇殑閿欒
+ /// 6锛氶噸澶嶅彂閫侊紝涓婂眰绯荤粺涓嶉渶瑕侀噸鍙�
+ /// 99锛氬叾浠栨湭鐭ラ敊璇紝璋冪敤澶辫触鍚庯紝鍙互閲嶈瘯
+ /// 100锛� 璇ヤ换鍔′笉瀛樺湪锛屼笂灞傜郴缁熶笉闇�閲嶅彂锛岄渶瑕佷汉宸ヤ粙鍏ュ鐞�
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 杩斿洖娑堟伅
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string Message { get; set; }
+
+ /// <summary>
+ /// 璇锋眰缂栧彿
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string ReqCode { get; set; }
+ }
#endregion
#region FuMa-Model
--
Gitblit v1.8.0