From b2c070eaf8cc59b40d27bda904312d0c394a51f4 Mon Sep 17 00:00:00 2001 From: lss <Lss@HanInfo> Date: 星期五, 20 六月 2025 17:23:37 +0800 Subject: [PATCH] 开发与优化 --- HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs | 265 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 201 insertions(+), 64 deletions(-) diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs index 90ec591..16d5a83 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs @@ -82,6 +82,14 @@ { public string TaskNo { get; set; } } + + /// <summary> + /// 鍙犵洏鏈虹姸鎬佸垏鎹�+ /// </summary> + public class MoboxChangeStatus + { + public string Type { get; set; } + } /// <summary> /// mobox 鎺ュ彛杩斿洖 /// </summary> @@ -175,7 +183,7 @@ /// <summary> /// 鎵樼洏缂栫爜 /// </summary> - public string CntrCode { get; set; } + public string ItemCode { get; set; } } @@ -202,56 +210,7 @@ #endregion #region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹璇锋眰鍙傛暟 - /// <summary> - /// 浠诲姟涓嬪彂 - /// </summary> - public partial class TaskPushModel - { - /// <summary> - /// 鎵樼洏鍙�- /// </summary> - [JsonProperty("cntrNo", NullValueHandling = NullValueHandling.Ignore)] - public string CntrNo { get; set; } - - /// <summary> - /// 鎵樼洏绫诲瀷 - /// </summary> - [JsonProperty("cntrType", NullValueHandling = NullValueHandling.Ignore)] - public string CntrType { get; set; } - - [JsonProperty("extData", NullValueHandling = NullValueHandling.Ignore)] - public string[] ExtData { get; set; } - - /// <summary> - /// 璧风偣 - /// </summary> - [JsonProperty("from", NullValueHandling = NullValueHandling.Ignore)] - public string From { get; set; } - - /// <summary> - /// 浠诲姟鍒嗙粍 - /// </summary> - [JsonProperty("groupNo", NullValueHandling = NullValueHandling.Ignore)] - public string GroupNo { get; set; } - - /// <summary> - /// 浠诲姟鍙�- /// </summary> - [JsonProperty("taskNo", NullValueHandling = NullValueHandling.Ignore)] - public string TaskNo { get; set; } - - /// <summary> - /// 浠诲姟绫诲瀷 - /// </summary> - [JsonProperty("taskType", NullValueHandling = NullValueHandling.Ignore)] - public string TaskType { get; set; } - - /// <summary> - /// 缁堢偣 - /// </summary> - [JsonProperty("to", NullValueHandling = NullValueHandling.Ignore)] - public string To { get; set; } - } + /// <summary> /// 璁惧淇″彿鍙嶉 @@ -327,24 +286,46 @@ [JsonProperty("taskNo")] public string TaskNo { get; set; } } - #endregion - - #region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹杩斿洖鍙傛暟 /// <summary> - /// 璁惧淇℃伅杩斿洖 + /// 鑾峰彇鎵樼洏鐗╂枡淇℃伅 /// </summary> - public partial class Result<T> + public partial class GetCntrInfoModel { - [JsonProperty("code")] - public long Code { get; set; } - - [JsonProperty("data")] - public List<T> Data { get; set; } - - [JsonProperty("msg")] - public string Msg { get; set; } + /// <summary> + /// 鎵樼洏鍙�+ /// </summary> + [JsonProperty("cntrNo")] + public string CntrNo { get; set; } } + + + /// <summary> + /// 璁惧鎶ヨ涓婃姤 + /// </summary> + public partial class NotifyAlarmModel + { + /// <summary> + /// 璁惧缂栧彿 + /// </summary> + [JsonProperty("deviceNo")] + public string DeviceNo { get; set; } + + /// <summary> + /// 閿欒鐮�+ /// </summary> + [JsonProperty("errCode")] + public string ErrCode { get; set; } + + /// <summary> + /// 閿欒淇℃伅 + /// </summary> + [JsonProperty("errMsg")] + public string ErrMsg { get; set; } + } + #endregion + + #region 澶ф磱绔嬪簱鎺ュ彛涓嬪彂鍙傛暟 /// <summary> /// 璁惧淇℃伅 /// </summary> @@ -380,12 +361,168 @@ [JsonProperty("workStatus")] public int WorkStatus { get; set; } } + + /// <summary> + /// 浠诲姟涓嬪彂 + /// </summary> + public partial class TaskPushModel + { + /// <summary> + /// 鎵樼洏鍙�+ /// </summary> + [JsonProperty("cntrNo", NullValueHandling = NullValueHandling.Ignore)] + public string CntrNo { get; set; } + + /// <summary> + /// 鎵樼洏绫诲瀷 + /// </summary> + [JsonProperty("cntrType", NullValueHandling = NullValueHandling.Ignore)] + public string CntrType { get; set; } + + [JsonProperty("extData", NullValueHandling = NullValueHandling.Ignore)] + public string[] ExtData { get; set; } + + /// <summary> + /// 璧风偣 + /// </summary> + [JsonProperty("from", NullValueHandling = NullValueHandling.Ignore)] + public string From { get; set; } + + /// <summary> + /// 浠诲姟鍒嗙粍 + /// </summary> + [JsonProperty("groupNo", NullValueHandling = NullValueHandling.Ignore)] + public string GroupNo { get; set; } + + /// <summary> + /// 浠诲姟鍙�+ /// </summary> + [JsonProperty("taskNo", NullValueHandling = NullValueHandling.Ignore)] + public string TaskNo { get; set; } + + /// <summary> + /// 浠诲姟绫诲瀷 + /// </summary> + [JsonProperty("taskType", NullValueHandling = NullValueHandling.Ignore)] + public string TaskType { get; set; } + + /// <summary> + /// 缁堢偣 + /// </summary> + [JsonProperty("to", NullValueHandling = NullValueHandling.Ignore)] + public string To { get; set; } + } + + /// <summary> + /// 璁惧鐘舵�鍒囨崲 + /// </summary> + public partial class ChangeStatusModel + { + /// <summary> + /// 璁惧缂栫爜 + /// </summary> + [JsonProperty("deviceNo")] + public string DeviceNo { get; set; } + + /// <summary> + /// 妯″紡绫诲瀷锛�锛氬彔鎵樻ā寮�2锛氭媶鎵樻ā寮�+ /// 鍙犳墭妯″紡锛屼笉闇�鎷嗗垎鎵樼洏鍒板叆搴撳彛銆�+ /// 鎷嗘墭妯″紡锛岄渶瑕佹媶鍒嗘墭鐩樺埌鍏ュ簱鍙�+ /// </summary> + [JsonProperty("Type")] + public string Type { get; set; } + } + + /// <summary> + /// 淇敼浠诲姟浼樺厛绾�+ /// </summary> + public partial class ChangePriorityModel + { + /// <summary> + /// 浼樺厛绾�+ /// </summary> + [JsonProperty("priority")] + public int Priority { get; set; } + + /// <summary> + /// 浠诲姟鍙�+ /// </summary> + [JsonProperty("taskNo")] + public string TaskNo { get; set; } + } + #endregion + + #region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹杩斿洖鍙傛暟 + + /// <summary> + /// 璁惧淇℃伅杩斿洖 + /// </summary> + public partial class Results<T> + { + [JsonProperty("code")] + public long Code { get; set; } + + [JsonProperty("data")] + public List<T> Data { get; set; } + + [JsonProperty("msg")] + public string Msg { get; set; } + } + + public partial class Result<T> + { + [JsonProperty("code")] + public int Code { get; set; } + + [JsonProperty("data")] + public T Data { get; set; } + + [JsonProperty("msg")] + public string Msg { get; set; } + } + + /// <summary> + /// 鐢宠缁堢偣 + /// </summary> + public partial class ApplyDestModel + { + /// <summary> + /// 鐢宠绫诲瀷锛�锛氬爢鍨涙満鏀捐揣寮傚父鐢宠鏂扮粓鐐癸紱2锛氳緭閫佺嚎鍒拌揪鎺ラ┏浣嶇敵璇风粓鐐癸紱 + /// </summary> + [JsonProperty("applyType")] + public long ApplyType { get; set; } + + /// <summary> + /// 褰撳墠浣嶇疆锛寃cs鑷鎺у埗鎵樼洏鍒扮壒瀹氱殑鍏ュ彛鏃讹紝wms鏍规嵁浣嶇疆璁$畻缁堢偣 + /// </summary> + [JsonProperty("loc")] + public string Loc { get; set; } + + /// <summary> + /// 浠诲姟鍙�+ /// </summary> + [JsonProperty("taskNo")] + public string TaskNo { get; set; } + } + + /// <summary> + /// 鐢宠缁堢偣杩斿洖 + /// </summary> + public partial class ReseltApplyDestModel + { + [JsonProperty("loc")] + public string Loc { get; set; } + } public partial class Empty { } + + #endregion + + } /// <summary> -- Gitblit v1.9.1