From 8bc65cd3363d7148c356fe2eecca3590a9a3b4e0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期二, 21 十月 2025 09:34:41 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Model/AGVModel.cs | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 163 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Model/AGVModel.cs b/Admin.NET/WCS.Application/Model/AGVModel.cs
index 0c46f23..370a320 100644
--- a/Admin.NET/WCS.Application/Model/AGVModel.cs
+++ b/Admin.NET/WCS.Application/Model/AGVModel.cs
@@ -6,6 +6,144 @@
namespace WCS.Application
{
+
+
+ #region JC34
+
+ /// <summary>
+ /// agv浠诲姟涓嬪彂model
+ /// </summary>
+ public class AgvTaskSend
+ {
+ /// <summary>
+ /// 澶栭儴浠诲姟鍞竴缂栧彿,濡傛灉涓虹┖锛岀郴缁熺敓鎴愪换鍔″彿骞惰繑鍥炪��
+ /// </summary>
+ public string robotTaskCode { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public string taskType { get; set; }
+ /// <summary>
+ /// 鎵ц姝ラ闆嗗悎銆傛湰娆′换鍔℃満鍣ㄤ汉闇�瑕佹墽琛岀殑鍏抽敭璺緞锛屽璐ф灦璧风偣 A 鑷冲嚭搴撳伐浣滃彴 B
+ /// </summary>
+ public List<targetRoute> targetRoute { get; set; }
+ /// <summary>
+ /// 浠诲姟鎵ц鐨勫垵濮嬩紭鍏堥『搴忥紝鏁板�艰秺澶э紝浼樺厛绾ц秺楂樸�備絾鏈哄櫒浜鸿皟搴︾郴缁熶細鏍规嵁浠诲姟绻佸繖绋嬪害锛屾満鍣ㄤ汉鐨勫伐浣滅姸鎬侊紝浠ュ強鍏朵粬浼樺厛绾т慨姝ｆ潯浠讹紝杩涜缁煎悎鍒ゅ畾鍚庯紝瀹炴椂鍔ㄦ�佽皟鏁翠换鍔″疄闄呯殑浼樺厛绾ф暟鍊笺�傝寖鍥达細1~120
+ /// </summary>
+ public int? initPriority { get; set; }
+
+ /// <summary>
+ /// 鑷畾涔夋墿灞曞瓧娈碉紝鍙殢涓氬姟鐨勫樊寮傝�屼紶鍏ヤ笉鍚岀殑鎵╁睍鍐呭锛屽湪涓氬姟娴佺▼鐨勬墽琛屼腑浣跨敤
+ /// </summary>
+ public extra extra { get; set; }
+ }
+ /// <summary>
+ /// 鎵ц姝ラ闆嗗悎銆傛湰娆′换鍔℃満鍣ㄤ汉闇�瑕佹墽琛岀殑鍏抽敭璺緞锛屽璐ф灦璧风偣 A 鑷冲嚭搴撳伐浣滃彴 B
+ /// </summary>
+ public class targetRoute
+ {
+ /// <summary>
+ /// 鐩爣璺緞搴忓垪銆備粠 0 寮�濮嬨��
+ /// </summary>
+ public int seq { get; set; }
+ /// <summary>
+ /// 鐩爣绫诲瀷銆傚彲鎵╁睍鏋氫妇鍊笺��
+ /// 棰勫埗鏋氫妇鍊硷細
+ /// ZONE鐩爣鎵�澶勫尯鍩熺紪鍙�
+ /// SITE绔欑偣鍒悕
+ /// STORAGE浠撲綅鍒悕
+ /// MAT_LABEL鐗╂枡鏍囩
+ /// CARRIER杞藉叿缂栧彿
+ /// STACK宸烽亾缂栧彿
+ /// STACK_LABEL宸烽亾鐗瑰緛鍊�
+ /// CHANNEL閫氶亾缂栧彿
+ /// EQPT 澶栭儴璁惧
+ /// PTL_WALL
+ /// CTU 缂撳瓨鏋�
+ /// CARRIER_TYPE杞藉叿绫诲瀷
+ /// BIN_TYPE浠撲綅绫诲瀷
+ /// AREA_STATION鍖哄煙宸ヤ綔鍙�
+ /// PILE_COUNT涓�娆℃惉鍑犱釜
+ /// MIX_CONDITION鏉′欢缁勫悎
+ /// DEGREE 鐑害
+ /// MULTI_BIN_GROUP澶氭繁浣嶇粍鍙�
+ /// </summary>
+ public string type { get; set; }
+ /// <summary>
+ /// 鏈哄櫒浜哄埌杈剧洰鏍囦綅缃悗鐨勬搷浣溿�傚浗鏍囪姹傦紝
+ /// 闈炲繀瑕併�傚 AMR 鍔ㄤ綔鏃犲奖鍝嶃�傚彲鎵╁睍鐨勬灇涓惧�笺��
+ /// 棰勫埗鏋氫妇鍊硷細
+ /// COLLECT鍙栬揣
+ /// DELIVERY閫佽揣
+ /// ROTATE鏃嬭浆
+ /// </summary>
+ public object code { get; set; }
+ }
+ public class extra
+ {
+ /// <summary>
+ /// 杞藉叿鐨勪俊鎭紝鍖呭惈杞藉叿缂栧彿銆佸眰鍙枫��
+ /// 浣跨敤鍦烘櫙锛�
+ /// 1.瑁呭嵏鏈烘垨杈撻�佺嚎涓撶敤
+ /// 2.杞藉叿涓庣珯鐐规病鏈夌粦瀹氾紝浣嗛渶瑕佷紶鍏ヨ浇鍏风殑鍦烘櫙銆�
+ /// </summary>
+ public List<carrierInfo> carrierInfo { get; set; }
+ }
+
+ public class carrierInfo
+ {
+ /// <summary>
+ /// 杞藉叿绫诲瀷
+ /// </summary>
+ public string carrierType { get; set; }
+ /// <summary>
+ /// 杞藉叿缂栧彿
+ /// </summary>
+ public string carrierCode { get; set; }
+ /// <summary>
+ /// 灞傚彿锛� 浠� 0 寮�濮嬨�佷粠涓嬪線涓婄紪鍙�
+ /// </summary>
+ public int layer { get; set; }
+ }
+
+ /// <summary>
+ /// 杩斿洖瀹炰綋
+ /// </summary>
+ public class ResponseAgvDto
+ {
+ /// <summary>
+ /// true 鎴愬姛 false 澶辫触
+ /// </summary>
+ public bool success { get; set; }
+ /// <summary>
+ /// 杩斿洖鐮�
+ /// SUCCESS锛氭垚鍔�
+ /// FAIL锛氬け璐�
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string code { get; set; }
+
+ /// <summary>
+ /// 杩斿洖娑堟伅
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string message { get; set; }
+
+ /// <summary>
+ /// 杩斿洖鐨勬暟鎹粨鏋�
+ /// 鏄惁蹇呭～锛氬惁
+ /// </summary>
+ public data data { get; set; }
+ }
+ public class data
+ {
+ public string robotTaskCode { get; set; }
+ }
+
+
+
+ #endregion
+
public class AGVApplyLockInput
{
/// <summary>
@@ -24,18 +162,38 @@
public string ReqTime { get; set; }
public string CurrentPositionCode { get; set; }
/// <summary>
- /// 鏂规硶鍚� end : 浠诲姟缁撴潫
- /// </summary>
- public string Method { get; set; }
- /// <summary>
/// 浠诲姟鍙�
/// </summary>
- public string TaskCode { get; set; }
+ public string robotTaskCode { get; set; }
/// <summary>
/// 鎵樼洏鍙�
/// </summary>
public string CtnrCode { get; set; }
+ public ExtraInfo Extra { get; set; }
+
+
+ }
+ public class ExtraInfo
+ {
+ public ExtraInfoVal Values { get; set; }
+ }
+ public class ExtraInfoVal
+ {
+
+ /// <summary>
+ /// 鏂规硶鍚� end : 浠诲姟缁撴潫
+ /// </summary>
+ public string Method { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string carrierCode { get; set; }
+ /// <summary>
+ /// 鎵樼洏鏁伴噺
+ /// </summary>
+ public int pileCount { get; set; }
}
public class AGVCallBackResponse
{
--
Gitblit v1.8.0