From f248d4a25fb196149c9add083e74252d7334b37d Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 05 六月 2025 17:31:45 +0800
Subject: [PATCH] 部分细节优化
---
api/ApiModel.cs | 339 +++++++++++++++++++-------------------------------------
1 files changed, 114 insertions(+), 225 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 9f65d18..f20f1c9 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -28,20 +28,6 @@
}
/// <summary>
- /// 鏋勫缓 <see cref="SimpleResult"/> 寮傚父杩斿洖鍊硷紝閫夋嫨鎵撳嵃寮傚父鏃ュ織淇℃伅锛堥粯璁ゆ墦鍗帮級
- /// </summary>
- /// <param name="ex"></param>
- /// <param name="exCode"></param>
- /// <param name="pringLog"></param>
- /// <returns></returns>
- public static SimpleResult BuildSimpleEx(Exception ex, int exCode = 1, bool pringLog = true) {
- if (pringLog) {
- LogHelper.InfoEx(ex);
- }
- return new SimpleResult { resultCode = exCode, resultMsg = ex.Message };
- }
-
- /// <summary>
/// HostToAGV 涓婃姤浠诲姟鐘舵�
/// </summary>
public class AgvTaskState {
@@ -69,7 +55,7 @@
public class SafetyInteractionInfo {
- public int station_id { get; set; }
+ //public int station_id { get; set; }
/// <summary>
/// 璇锋眰涓婄嚎/涓嬬嚎鐨勭殑绔欏彴搴撲綅鍚嶇О锛屼緥濡倃ork6銆亀ork8
@@ -80,7 +66,7 @@
/// 璇锋眰鐮� /// </summary>
public string apply_code { get; set; }
- public string task_no { set; get; }
+ //public string task_no { set; get; }
}
/// <summary>
@@ -89,6 +75,10 @@
public class ReturnResult {
public int ResultCode { get; set; }
public string ResultMsg { get; set; }
+ }
+
+ public static ReturnResult NewReturnResult(int code, string message) {
+ return new ReturnResult { ResultCode = code, ResultMsg = message };
}
public class orderStatusReportParme {
@@ -116,8 +106,6 @@
/// 璁㈠崟褰撳墠鐨勭洰鐨勫湴
/// </summary>
public string currentDes { get; set; }
-
-
/// <summary>
/// 褰撳墠鎸囦护
/// </summary>
@@ -153,109 +141,45 @@
/// 杩斿洖缁橤Z
/// </summary>
public class GzResult {
-
public int resultCode { get; set; }
public string msg { get; set; }
public int orderID { get; set; }
}
-
-
}
public class OtherModel {
- #region PDA 鏁版嵁
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫�+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫� /// </summary>
public class GoodpackOfflineInfo {
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
- public string s_item_code { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
+ [JsonProperty("s_item_code")]
+ public string ItemCode { get; set; }
/// <summary>
/// 鎵规鍙� /// </summary>
- public string s_batch { get; set; }
+ [JsonProperty("s_batch")]
+ public string BatchNo { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
-
- public string s_spec { get; set; }
+ [JsonProperty("s_spec")]
+ public string Spec { get; set; }
/// <summary>
/// 鏁伴噺
/// </summary>
- public int n_num { get; set; }
+ [JsonProperty("n_num")]
+ public int Num { get; set; }
/// <summary>
- /// 璧风偣璐т綅淇℃伅
+ /// 璧风偣璐т綅淇℃伅锛堣捣鐐硅揣浣嶈揣鍖鸿姹傦細MXCZQ 婊＄鎿嶄綔鍖猴級
/// </summary>
- public string s_start_loc { get; set; }
+ [JsonProperty("s_start_loc")]
+ public string StartLoc { get; set; }
}
- /// <summary>
- /// 绌烘墭/绌虹鍏ュ簱缁戝畾(PDA)鏁版嵁绫�- /// </summary>
- public class EmptyBindInfo {
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
-
- [JsonProperty("s_cntr_code")]
- public string CntrCode { get; set; }
- /// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// </summary>
-
- [JsonProperty("s_cntr_type")]
- public string CntrType { get; set; }
- ///// <summary>
- ///// 鎵樼洏鏁伴噺锛堜粎褰撳鍣ㄧ被鍨嬩负鎵樼洏鏃朵娇鐢級
- ///// </summary>
- //[JsonProperty("pallet_count", NullValueHandling = NullValueHandling.Ignore)]
- //public int PalletCount { get; set; }
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- [JsonProperty("s_loc_code")]
- public string LocCode { get; set; }
- }
- /// <summary>
- /// 绌烘墭缁戝畾
- /// </summary>
- public class EmptyBindPalletInfo {
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
- public string CntrCode { get; set; }
-
- /// <summary>
- /// 鎵樼洏鏁伴噺
- /// </summary>
- public int PalletCount { get; set; }
-
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- public string LocCode { get; set; }
- }
- /// <summary>
- /// 绌虹缁戝畾
- /// </summary>
- public class EmptyBindGoodpackInfo {
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
- public string CntrCode { get; set; }
-
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- public string LocCode { get; set; }
- }
+
/// <summary>
/// 绌烘墭/绌虹鍏ュ簱(PDA)鏁版嵁绫� /// </summary>
@@ -266,117 +190,57 @@
[JsonProperty("cntr_code")]
public string CntrCode { get; set; }
/// <summary>
- /// 瀹瑰櫒绫诲瀷
+ /// 瀹瑰櫒绫诲瀷锛堝繀椤讳负 '绌烘墭鐩樷� 鎴�鈥樼┖濂借繍绠�锛� /// </summary>
[JsonProperty("cntr_type")]
public string CntrType { get; set; }
/// <summary>
- /// 缁堢偣搴撳尯缂栫爜
+ /// 缁堢偣搴撳尯缂栫爜锛堟墭鐩樻槸 KTCFQ 绌烘墭瀛樻斁鍖猴紱濂借繍绠辨槸 CXHJQ 绌虹璐ф灦鍖猴級
/// </summary>
[JsonProperty("end_area")]
public string EndArea { get; set; }
/// <summary>
- /// 璧风偣璐т綅
+ /// 璧风偣璐т綅锛堟墭鐩樻槸 KTJBQ 绌烘墭鍏ュ簱鎺ラ┏鍖猴紱濂借繍绠辨槸 KXJBQ 绌虹鍏ュ簱鎺ラ┏鍖猴級
/// </summary>
[JsonProperty("start_loc")]
public string StartLoc { get; set; }
}
-
- public class EmptyInboundDetailInfo { }
-
- //public class EmptyOnlineInfo {
- // public string ItemCode { get; set; }
- // public string ItemName { get; set; }
- // public string PatchNo { get; set; }
- // public string EndLoc { get; set; }
- //}
-
+ /// <summary>
+ /// 绌虹涓婄嚎淇℃伅
+ /// </summary>
public class EmptyOnlinePalletInfo {
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
-
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鎵规鍙� /// </summary>
-
[JsonProperty("batch_no")]
public string BatchNo { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
[JsonProperty("spe")]
- public string Spe { get; set; }
+ public string Spec { get; set; }
/// <summary>
- /// 瀹瑰櫒缂栫爜
+ /// 瀹瑰櫒鍙� /// </summary>
[JsonProperty("cnt_id")]
- public string CntId { get; set; }
- // 瀹瑰櫒绫诲瀷 = 鎵樼洏
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 鎵樼洏
}
-
- public class EmptyOnlineGoodpackInfo {
- // 瀹瑰櫒绫诲瀷 = 濂借繍绠�- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
- [JsonProperty("cnt_id")]
- public string CntId { get; set; }
- }
-
/// <summary>
- /// 鎶芥-鍒涘缓鎶芥鍗�WMS)鏁版嵁绫�+ /// 绌哄ソ杩愮涓婄嚎淇℃伅
/// </summary>
- public class CreateCheckOrderInfo {
+ public class EmptyOnlineGoodpackInfo {
/// <summary>
- /// 鐗╂枡缂栫爜
+ /// 瀹瑰櫒鍙� /// </summary>
-
- [JsonProperty("item_code")]
- public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [JsonProperty("spe")]
- public string Spe { get; set; }
- /// <summary>
- /// 鎵规鍙�- /// </summary>
-
- [JsonProperty("batch_no")]
- public string BatchNo { get; set; }
- /// <summary>
- /// 闇�嚭搴撴暟閲�- /// </summary>
- [JsonProperty("qty")]
- public int Qty { get; set; }
- /// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// </summary>
-
- [JsonProperty("cntr_type")]
- public string CntrType { get; set; }
- /// <summary>
- /// 鍑哄簱缁堢偣璐у尯
- /// </summary>
-
- [JsonProperty("end_area")]
- public string EndArea { get; set; }
+ [JsonProperty("cnt_id")]
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 濂借繍绠� }
+
/// <summary>
/// 鎶芥-鍚堟牸鍥炲簱(PDA) 鏁版嵁绫� /// </summary>
@@ -393,21 +257,17 @@
public string CntrCode { get; set; }
}
+ /// <summary>
+ /// 涓嶅悎鏍肩Щ搴撴暟鎹被
+ /// </summary>
public class UnqualifiedShiftInfo : QualifiedBackInfo {
/// <summary>
- /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖�+ /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖猴紙蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖猴級
/// </summary>
[JsonProperty("end_area")]
public string EndArea { get; set; }
}
- public class CheckShiftInfo : UnqualifiedShiftInfo {
- public bool Qualified { get; set; }
- }
-
- #endregion
-
- #region WMS 鏁版嵁
/// <summary>
/// 鎴愬搧鑳跺嚭搴�PDA)
/// </summary>
@@ -417,11 +277,6 @@
/// </summary>
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
@@ -453,35 +308,6 @@
[JsonProperty("force_out")]
public bool ForcedOut { get; set; }
}
- /// <summary>
- /// 绉诲簱-鍒涘缓绉诲簱浠诲姟鏁版嵁绫�- /// </summary>
- public class CreateShiftOrderInfo {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
-
- [JsonProperty("item_code")]
- public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
- /// <summary>
- /// 鎵规鍙�- /// </summary>
-
- [JsonProperty("batch_no")]
- public string BatchNo { get; set; }
- /// <summary>
- /// 绉诲簱缁堢偣璐у尯
- /// </summary>
-
- [JsonProperty("end_area")]
- public string EndArea { get; set; }
- }
/// <summary>
/// 浣欐枡灏剧鍥炲簱(PDA)鏁版嵁绫�@@ -493,7 +319,6 @@
[JsonProperty("start_loc")]
public string StartLoc { get; set; }
}
- #endregion
/// <summary>
/// 鐗╂枡淇℃伅涓嬪彂鍚屾 鏁版嵁绫�@@ -504,42 +329,47 @@
/// </summary>
[JsonProperty("itemName")]
public string ItemName { get; set; }
-
/// <summary>
- /// 浜у搧鐗屽彿
+ /// 鐗╂枡缂栫爜
/// </summary>
[JsonProperty("itemCode")]
public string ItemCode { get; set; }
-
/// <summary>
/// 鎵规鍙� /// </summary>
[JsonProperty("batchNo")]
public string BatchNo { get; set; }
-
/// <summary>
/// 鎵ц鏍囧噯
/// </summary>
[JsonProperty("standard")]
public string Standard { get; set; }
-
/// <summary>
/// 鍑�惈閲� /// </summary>
[JsonProperty("netWeight")]
public string NetWeight { get; set; }
-
/// <summary>
/// 璐ㄩ噺绛夌骇
/// </summary>
[JsonProperty("qualityGrade")]
public string QualityGrade { get; set; }
+ /// <summary>
+ /// 鏂欑缂栧彿锛堝緟瀹氾級
+ /// </summary>
+ [JsonProperty("cntrCode")]
+ public string CntrCode { get; set; }
+ ///// <summary>
+ ///// 浜х嚎鍙凤紙寰呭畾锛屽ソ杩愮鏈�鏉′骇绾匡紝瀵瑰簲2涓笅绾胯揣浣嶏紝杩欓噷鏆傚畾涓猴細3鍜�锛�+ ///// </summary>
+ //[JsonProperty("prodLineId")]
+ //public string ProdLineId { get; set; }
}
/// <summary>
/// MES API 鍝嶅簲缁撴灉绫� /// </summary>
- public class WmsResult {
+ public class MesResult {
/// <summary>
/// 鎺ュ彛璋冪敤缁撴灉 1-鎴愬姛 0-澶辫触
/// </summary>
@@ -559,15 +389,74 @@
public string Data { get; set; }
}
- public static WmsResult MesResultBuilder(int code, string message = "", bool printLog = true) {
- if (printLog && string.IsNullOrEmpty(message)) {
- LogHelper.Info(message);
- }
- return new WmsResult {
+ public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
+ return new MesResult {
Result = code,
Success = code == 0, // 浠呭綋code=0鏃讹紝success=true
Data = message,
};
}
+
+ /// <summary>
+ /// 鍙嶉 ERP 鐨勬暟鎹被鍨�+ /// </summary>
+ public class ErpResult {
+ [JsonProperty("code")]
+ public int Code { get; set; }
+ [JsonProperty("message")]
+ public string Message { get; set; }
+ }
+
+ public static ErpResult NewErpResult(int code, string message) {
+ return new ErpResult { Code = code, Message = message };
+ }
+
+ /// <summary>
+ /// ERP 涓嬪彂鍑哄簱浠诲姟鐨勬暟鎹被鍨�+ /// </summary>
+ public class ErpSendOutboundOrderInfo {
+ public string ErpNo { get; set; } // ERP 鍗曞彿
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [JsonProperty("item_code")]
+ public string ItemCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [JsonProperty("spe")]
+ public string Spe { get; set; }
+ /// <summary>
+ /// 鎵规鍙�+ /// </summary>
+ [JsonProperty("batch_no")]
+ public string BatchNo { get; set; }
+ /// <summary>
+ /// 闇�嚭搴撴暟閲�+ /// </summary>
+ [JsonProperty("qty")]
+ public int Qty { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ [JsonProperty("cntr_type")]
+ public string CntrType { get; set; }
+ /// <summary>
+ /// 鍑哄簱缁堢偣璐у尯
+ /// </summary>
+ [JsonProperty("end_area")]
+ public string EndArea { get; set; }
+ /// <summary>
+ /// 鏄惁寮哄埗鍑哄簱
+ /// </summary>
+ [JsonProperty("force_out")]
+ public bool ForcedOut { get; set; }
+
+ }
+
+ public class PickUpReturnErpInfo {
+ public string LocCode { get; set; }
+
+ }
}
}
--
Gitblit v1.9.1