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 | 282 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 225 insertions(+), 57 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 565a7a7..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,6 +210,158 @@
#endregion
#region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹璇锋眰鍙傛暟
+
+
+ /// <summary>
+ /// 璁惧淇″彿鍙嶉
+ /// </summary>
+ public partial class NotifyDeviceSignalModel
+ {
+ /// <summary>
+ /// 鎵樼洏鍙凤紝鍙┖锛屽涓墭鐩樺彿鍙互鎷兼帴
+ /// </summary>
+ [JsonProperty("cntrNo")]
+ public string CntrNo { get; set; }
+
+ /// <summary>
+ /// 璁惧缂栧彿
+ /// </summary>
+ [JsonProperty("deviceNo")]
+ public string DeviceNo { get; set; }
+
+ [JsonProperty("extData")]
+ public Dictionary<string, object>[] ExtData { get; set; }
+
+ /// <summary>
+ /// 璐т綅锛屼笂鏂欑偣銆佷笅鏂欑偣銆佽鐮佷綅銆佺О閲嶄綅
+ /// </summary>
+ [JsonProperty("loc")]
+ public string Loc { get; set; }
+
+ /// <summary>
+ /// 璇锋眰绫诲瀷锛�:鍏ュ簱鐢宠
+ /// </summary>
+ [JsonProperty("signalType")]
+ public int SignalType { get; set; }
+ }
+
+ /// <summary>
+ /// 浠诲姟鐘舵�鍙嶉
+ /// </summary>
+ public partial class NotifyTaskStatusModel
+ {
+ /// <summary>
+ /// 璁惧鍙�+ /// </summary>
+ [JsonProperty("deviceNo")]
+ public string DeviceNo { get; set; }
+
+ /// <summary>
+ /// 寮傚父浠ｇ爜锛屼富瑕佹槸閽堝鍚勭寮傚父鍙栨秷鐨勬弿杩�+ /// </summary>
+ [JsonProperty("errCode")]
+ public int ErrCode { get; set; }
+
+ /// <summary>
+ /// 褰撳墠鎵樼洏浣嶇疆
+ /// </summary>
+ [JsonProperty("loc")]
+ public string Loc { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵�锛�锛氬紑濮�鎵ц涓紱2锛氬畬鎴愶紱3锛氬噯澶囧彇璐э紱4锛氬彇璐у畬鎴愶紱5锛氬噯澶囧嵏璐э紱6锛氬嵏璐у畬鎴愶紱7锛氬紓甯稿彇娑堬紱8锛氬己鍒跺畬鎴�+ /// </summary>
+ [JsonProperty("status")]
+ public int Status { get; set; }
+
+ /// <summary>
+ /// wcs鐨勫瓙浠诲姟鍙凤紝濡傛灉wcs浠诲姟鎷嗗垎浜嗭紝鍙互涓�捣涓婃姤瀛愪换鍔″彿锛屾柟渚挎棩蹇楄拷韪�+ /// </summary>
+ [JsonProperty("subTaskNo")]
+ public string SubTaskNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ [JsonProperty("taskNo")]
+ public string TaskNo { get; set; }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵樼洏鐗╂枡淇℃伅
+ /// </summary>
+ public partial class GetCntrInfoModel
+ {
+ /// <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>
+ public partial class DeviceStatusModel
+ {
+ /// <summary>
+ /// 褰撳墠鏁伴噺锛屽彔鐩樻満褰撳墠鎵樼洏鏁伴噺
+ /// </summary>
+ [JsonProperty("cntrQty")]
+ public string CntrQty { get; set; }
+
+ /// <summary>
+ /// 璁惧缂栧彿鎴栬�绾夸綋缂栧彿
+ /// </summary>
+ [JsonProperty("deviceNo")]
+ public string DeviceNo { get; set; }
+
+ /// <summary>
+ /// 浜哄伐璁剧疆鐘舵�锛�鍚敤锛�绂佺敤
+ /// </summary>
+ [JsonProperty("manualStatus")]
+ public int ManualStatus { get; set; }
+
+ /// <summary>
+ /// 鍏夌數鐘舵�锛�鏄湁杞斤紝0鏄┖杞�+ /// </summary>
+ [JsonProperty("photoStatus")]
+ public int PhotoStatus { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綔鐘舵�锛�鍙敤锛�涓嶅彲鐢�+ /// </summary>
+ [JsonProperty("workStatus")]
+ public int WorkStatus { get; set; }
+ }
+
/// <summary>
/// 浠诲姟涓嬪彂
/// </summary>
@@ -252,27 +412,52 @@
[JsonProperty("to", NullValueHandling = NullValueHandling.Ignore)]
public string To { get; set; }
}
-
+
/// <summary>
- /// 璁惧淇″彿鍙嶉
+ /// 璁惧鐘舵�鍒囨崲
/// </summary>
- public partial class PutInModel
+ public partial class ChangeStatusModel
{
/// <summary>
- /// 璧风偣
+ /// 璁惧缂栫爜
/// </summary>
- public string startBit { get; set; }
+ [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 Result<T>
+ public partial class Results<T>
{
[JsonProperty("code")]
public long Code { get; set; }
@@ -283,78 +468,61 @@
[JsonProperty("msg")]
public string Msg { get; set; }
}
- /// <summary>
- /// 璁惧淇℃伅
- /// </summary>
- public partial class DeviceStatusModel
+
+ public partial class Result<T>
{
- /// <summary>
- /// 褰撳墠鏁伴噺锛屽彔鐩樻満褰撳墠鎵樼洏鏁伴噺
- /// </summary>
- [JsonProperty("cntrQty")]
- public string CntrQty { get; set; }
+ [JsonProperty("code")]
+ public int Code { get; set; }
- /// <summary>
- /// 璁惧缂栧彿鎴栬�绾夸綋缂栧彿
- /// </summary>
- [JsonProperty("deviceNo")]
- public string DeviceNo { get; set; }
+ [JsonProperty("data")]
+ public T Data { get; set; }
- /// <summary>
- /// 浜哄伐璁剧疆鐘舵�锛�鍚敤锛�绂佺敤
- /// </summary>
- [JsonProperty("manualStatus")]
- public int ManualStatus { get; set; }
-
- /// <summary>
- /// 鍏夌數鐘舵�锛�鏄湁杞斤紝0鏄┖杞�- /// </summary>
- [JsonProperty("photoStatus")]
- public int PhotoStatus { get; set; }
-
- /// <summary>
- /// 宸ヤ綔鐘舵�锛�鍙敤锛�涓嶅彲鐢�- /// </summary>
- [JsonProperty("workStatus")]
- public int WorkStatus { get; set; }
+ [JsonProperty("msg")]
+ public string Msg { get; set; }
}
+
+
/// <summary>
- /// 璁惧淇″彿鍙嶉
+ /// 鐢宠缁堢偣
/// </summary>
- public partial class EquipmentInfoModel
+ public partial class ApplyDestModel
{
/// <summary>
- /// 鎵樼洏鍙凤紝鍙┖锛屽涓墭鐩樺彿鍙互鎷兼帴
+ /// 鐢宠绫诲瀷锛�锛氬爢鍨涙満鏀捐揣寮傚父鐢宠鏂扮粓鐐癸紱2锛氳緭閫佺嚎鍒拌揪鎺ラ┏浣嶇敵璇风粓鐐癸紱
/// </summary>
- [JsonProperty("cntrNo")]
- public string CntrNo { get; set; }
+ [JsonProperty("applyType")]
+ public long ApplyType { get; set; }
/// <summary>
- /// 璁惧缂栧彿
- /// </summary>
- [JsonProperty("deviceNo")]
- public string DeviceNo { get; set; }
-
- [JsonProperty("extData")]
- public Dictionary<string, object>[] ExtData { get; set; }
-
- /// <summary>
- /// 璐т綅锛屼笂鏂欑偣銆佷笅鏂欑偣銆佽鐮佷綅銆佺О閲嶄綅
+ /// 褰撳墠浣嶇疆锛寃cs鑷鎺у埗鎵樼洏鍒扮壒瀹氱殑鍏ュ彛鏃讹紝wms鏍规嵁浣嶇疆璁＄畻缁堢偣
/// </summary>
[JsonProperty("loc")]
public string Loc { get; set; }
/// <summary>
- /// 璇锋眰绫诲瀷锛�:鍏ュ簱鐢宠
+ /// 浠诲姟鍙� /// </summary>
- [JsonProperty("signalType")]
- public long SignalType { get; set; }
+ [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