From d09a1552e45e6cfc8f83c0249cd296b8706c0dc2 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 20 五月 2025 09:33:27 +0800
Subject: [PATCH] 修改下发AGV任务接口，修改条码增加功能
---
Wms/Model/InterFaceModel/HttpModel.cs | 167 ++++++++++++++++++++++++-------------------------------
1 files changed, 74 insertions(+), 93 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index a2e2dc4..2cb35e1 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -655,154 +655,122 @@
public class AgvTaskDto
{
/// <summary>
- /// 璇锋眰缂栧彿锛屾瘡涓姹傞兘瑕佷竴涓敮涓�缂栧彿
- /// 鍚屼竴涓姹傞噸澶嶆彁浜� 浣跨敤鍚屼竴缂栧彿
- /// 鏄惁蹇呭～锛氭槸
+ /// 浠诲姟鍙�
/// </summary>
- public string reqCode { get; set; }
+ public string robotTaskCode { get; set; }
/// <summary>
- /// 璇锋眰鏃堕棿鎴�
- /// 鏍煎紡: 鈥測yyy-MM-ddHH:mm:ss鈥�
- /// 鏄惁蹇呭～锛氭槸
+ /// 褰撳墠鎵ц浠诲姟鐨勬満鍣ㄤ汉鍞竴鏍囪瘑
/// </summary>
- public string reqTime { get; set; }
+ public string singleRobotCode { get; set; }
+
+ public int currentSeq { get; set; }
/// <summary>
- /// 鍦扮爜 X 鍧愭爣(mm)锛氫换鍔″畬鎴愭椂鏈夊��
- /// 鏄惁蹇呭～锛氬惁
+ /// 鑷畾涔夋墿灞曞瓧娈�
/// </summary>
- public double cooX { get; set; }
+ public ExtraModel extra { get; set; }
+ }
+
+
+ public class ExtraModel
+ {
+ public string async { get; set; } = "0";
/// <summary>
- /// 鍦扮爜 Y 鍧愭爣(mm)锛氫换鍔″畬鎴愭椂鏈夊��
- /// 鏄惁蹇呭～锛氬惁
+ /// 鍥炶皟鏁版嵁瀵硅薄
/// </summary>
- public double cooY { get; set; }
+ public ExtraModelView values { get; set; }
- /// <summary>
- /// 褰撳墠浣嶇疆缂栧彿
- /// 浠诲姟寮�濮嬶細璇ヤ綅缃负浠诲姟璧风偣
- /// 璧板嚭鍌ㄤ綅锛氳浣嶇疆涓轰换鍔¤捣鐐�
- /// 浠诲姟鍗曞彇娑堬細璇ヤ綅缃负宸ヤ綔浣嶇紪鍙�
- /// 浠诲姟缁撴潫锛氳浣嶇疆涓轰换鍔＄粓鐐�
- /// 鍙栨斁鐢宠锛氬彇鏀炬枡绠辩殑鐐�
- /// 鏄惁蹇呭～锛氭槸
- /// </summary>
- public string currentPositionCode { get; set; }
+ }
- /// <summary>
- /// 鑷畾涔夊瓧娈碉紝涓嶈秴杩� 2000 涓瓧绗�
- /// 鏄惁蹇呭～锛氬惁
- /// </summary>
- public string data { get; set; }
+ /// <summary>
+ /// 鍥炶皟鍙傛暟
+ /// </summary>
+ public class ExtraModelView
+ {
/// <summary>
/// 鍦板浘缂栧彿
- /// 鏄惁蹇呭～锛氬惁
/// </summary>
public string mapCode { get; set; }
/// <summary>
- /// 鍦扮爜缂栧彿锛氫换鍔″畬鎴愭椂鏈夊��
- /// 鏄惁蹇呭～锛氬惁
- /// </summary>
- public string mapDataCode { get; set; }
-
- /// <summary>
- /// 浠撲綅缂栧彿锛氬弶杞︿笌 CTU 浠诲姟鏃舵湁鍊�
- /// 鏄惁蹇呭～锛氬惁
- /// </summary>
- public string stgBinCode { get; set; }
-
- /// <summary>
- /// 鏂规硶鍚�, 鍙娇鐢ㄤ换鍔＄被鍨嬪仛涓烘柟娉曞悕
- /// 鐢� RCS-2000 浠诲姟妯℃澘閰嶇疆鍚庡苟鍛婄煡涓婂眰绯荤粺
- /// 榛樿浣跨敤鏂瑰紡:
- /// start : 浠诲姟寮�濮�
- /// outbin : 璧板嚭鍌ㄤ綅
- /// end : 浠诲姟缁撴潫
- /// cancel : 浠诲姟鍗曞彇娑�
- /// apply锛欳TU 鏂欑鍙栨斁鐢宠
- /// 鏄惁蹇呭～锛氭槸
+ /// 鍥炶皟浠诲姟
+ /// <para> start:浠诲姟寮�濮�,outbin:璧板嚭鍌ㄤ綅,end:浠诲姟瀹屾垚</para>
/// </summary>
public string method { get; set; }
/// <summary>
- /// 璐ф灦缂栧彿锛氳儗璐ф灦鏃舵湁鍊�
- /// 鏄惁蹇呭～锛氬惁
+ /// 杞藉叿缂栧彿
/// </summary>
- public string podCode { get; set; }
+ public string carrierCode { get; set; }
/// <summary>
- /// 鍒搴斿湴鍥剧殑浠诲姟瀹屾垚鏃舵湁鍊�
- /// 宸�: 180
- /// 鍙�: 0
- /// 涓�: 90
- /// 涓�: -90
- /// 鏄惁蹇呭～锛氬惁
+ /// 杞藉叿鍚嶇О
/// </summary>
- public string podDir { get; set; }
+ public string carrierName { get; set; }
/// <summary>
- /// 鐗╂枡缂栧彿
- /// 鏄惁蹇呭～锛氬惁
+ /// 杞藉叿绫诲瀷
/// </summary>
- public string materialLot { get; set; }
+ public string carrierType { get; set; }
/// <summary>
- /// AGV 缂栧彿锛堝悓 agvCode 锛�
- /// 鏄惁蹇呭～锛氬惁
+ /// 杞藉叿绉嶇被
/// </summary>
- public string robotCode { get; set; }
+ public string carrierCategory { get; set; }
+
/// <summary>
- /// 褰撳墠浠诲姟鍗曞彿
- /// 鏄惁蹇呭～锛氭槸
+ /// 褰撳墠绔欑偣缂栧彿
/// </summary>
- public string taskCode { get; set; }
+ public string slotCode { get; set; }
/// <summary>
- /// 宸ヤ綔浣嶏紝涓� RCS-2000 绔厤缃殑浣嶇疆鍚嶇О涓�鑷淬�備换鍔″畬鎴愭椂鏈夊�硷紝涓庣敓鎴愪换鍔″崟鎺ュ彛涓殑 wbCode 涓�鑷�
- /// 鏄惁蹇呭～锛氬惁
+ /// 绔欑偣鍒悕
+ /// <para>1.璧板嚭鍌ㄤ綅:璧风偣銆�2.浠诲姟瀹屾垚:鐩爣鐐�</para>
/// </summary>
- public string wbCode { get; set; }
+ public string slotName { get; set; }
/// <summary>
- /// 瀹瑰櫒缂栧彿
- /// 鏄惁蹇呭～锛氬惁
+ /// 瀛樺偍绫诲瀷(BIN:浠撲綅,SITE:绔欑偣)
/// </summary>
- public string ctnrCode { get; set; }
+ public string slotCategory { get; set; }
/// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// 鏄惁蹇呭～锛氬惁
+ /// x鍧愭爣
/// </summary>
- public string ctnrType { get; set; }
+ public decimal? x { get; set; }
/// <summary>
- /// 宸烽亾缂栧彿
- /// 鏄惁蹇呭～锛氬惁
+ /// y鍧愭爣
/// </summary>
- public string roadWayCode { get; set; }
+ public decimal? y { get; set; }
/// <summary>
- /// 宸烽亾鍐呴『搴忓彿
- /// 宸烽亾灏炬槸 0锛屽埌宸烽亾澶翠緷娆￠�掑 1
- /// 鏄惁蹇呭～锛氬惁
+ /// 鏈哄櫒浜虹绫�
/// </summary>
- public string seq { get; set; }
+ public string amrCategory { get; set; }
/// <summary>
- /// 璁惧缂栧彿锛屽姊抽娇寮忓伐浣滅珯銆佽緭閫佺嚎绛夛紝涓�鑸娇鐢ㄤ簬 CTU 鍦烘櫙銆傜郴缁熸牴鎹粨浣嶅畾浣嶅埌鍏宠仈鐨勮澶囩紪鍙枫��
- /// 鏄惁蹇呭～锛氬惁
+ /// 鏈哄櫒浜虹被鍨�
/// </summary>
- public string eqpCode { get; set; }
+ public string amrType { get; set; }
+
+
+ public int? pileCount { get; set; }
+ public int? layerNo { get; set; }
+ public string amrCode { get; set; }
+
}
- /// <summary>
- /// WMS鍥炲簲AGV淇℃伅
- /// </summary>
- public class OutCommanAgvDto
+}
+
+
+/// <summary>
+/// WMS鍥炲簲AGV淇℃伅
+/// </summary>
+public class OutCommanAgvDto
{
/// <summary>
/// 杩斿洖鐮�
@@ -853,5 +821,18 @@
public string data { get; set; }
public string reqCode { get; set; }
}
+
+/// <summary>
+/// agv璇锋眰鎺ュ彛搴旂瓟
+/// </summary>
+public class AgvResultModel2
+{
+ public string code { get; set; }
+ public string message { get; set; }
+ public Data da { get; set; }
+}
+public class Data
+{
+ public string robotTaskCode { get; set; }
#endregion
}
--
Gitblit v1.8.0