From 6b43055b5aa32dbea0dacee5a0235b0d5a76c293 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 30 五月 2025 17:19:35 +0800
Subject: [PATCH] 优化后台报错信息，空箱入库容器号增加检查逻辑
---
api/ApiModel.cs | 204 ++++++++++----------------------------------------
1 files changed, 41 insertions(+), 163 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 4b66d75..30b6b23 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -106,8 +106,6 @@
/// 璁㈠崟褰撳墠鐨勭洰鐨勫湴
/// </summary>
public string currentDes { get; set; }
-
-
/// <summary>
/// 褰撳墠鎸囦护
/// </summary>
@@ -151,9 +149,8 @@
}
public class OtherModel {
- #region PDA 鏁版嵁
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫�+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫� /// </summary>
public class GoodpackOfflineInfo {
/// <summary>
@@ -161,11 +158,6 @@
/// </summary>
[JsonProperty("s_item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鎵规鍙� /// </summary>
@@ -182,71 +174,12 @@
[JsonProperty("n_num")]
public int Num { get; set; }
/// <summary>
- /// 璧风偣璐т綅淇℃伅
+ /// 璧风偣璐т綅淇℃伅锛堣捣鐐硅揣浣嶈揣鍖鸿姹傦細MXCZQ 婊＄鎿嶄綔鍖猴級
/// </summary>
[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>
@@ -257,77 +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 EmptyOnlinePalletInfo {
- [JsonProperty("item_code")]
- public string ItemCode { get; set; }
- [JsonProperty("batch_no")]
- public string BatchNo { get; set; }
- [JsonProperty("spe")]
- public string Spec { get; set; } // 鐗╂枡瑙勬牸
- [JsonProperty("cnt_id")]
- public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 鎵樼洏
- }
-
- public class EmptyOnlineGoodpackInfo {
- [JsonProperty("cnt_id")]
- public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 濂借繍绠�- }
-
/// <summary>
- /// 鎶芥-鍒涘缓鎶芥鍗�WMS)鏁版嵁绫�+ /// 绌虹涓婄嚎淇℃伅
/// </summary>
- public class CreateCheckOrderInfo {
+ public class EmptyOnlinePalletInfo {
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
-
[JsonProperty("item_code")]
public string ItemCode { 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("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>
+ /// 绌哄ソ杩愮涓婄嚎淇℃伅
+ /// </summary>
+ public class EmptyOnlineGoodpackInfo {
+ /// <summary>
+ /// 瀹瑰櫒鍙�+ /// </summary>
+ [JsonProperty("cnt_id")]
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 濂借繍绠�+ }
+
/// <summary>
/// 鎶芥-鍚堟牸鍥炲簱(PDA) 鏁版嵁绫� /// </summary>
@@ -344,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>
@@ -368,11 +277,6 @@
/// </summary>
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
@@ -404,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)鏁版嵁绫�@@ -444,16 +319,24 @@
[JsonProperty("start_loc")]
public string StartLoc { get; set; }
}
- #endregion
/// <summary>
/// 鐗╂枡淇℃伅涓嬪彂鍚屾 鏁版嵁绫� /// </summary>
public class CgInfoSyncInfo {
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </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; }
@@ -531,11 +414,6 @@
/// </summary>
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
--
Gitblit v1.9.1