From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
api/ApiModel.cs | 333 +++++++++++++++----------------------------------------
1 files changed, 91 insertions(+), 242 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 4b66d75..dba3f6a 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -4,6 +4,8 @@
using System.Text;
using System.Threading.Tasks;
+using HH.WCS.Mobox3.DSZSH.util;
+
using Newtonsoft.Json;
namespace HH.WCS.Mobox3.DSZSH.api {
@@ -17,14 +19,14 @@
public List<object> result { get; set; } = new List<object>();
}
- /// <summary>
- /// 鏋勫缓 <see cref="SimpleResult"/> 杩斿洖鍊�- /// </summary>
- /// <param name="code"></param>
- /// <param name="message"></param>
- /// <returns></returns>
- public static SimpleResult NewSimpleResult(int code, string message) {
+ public static SimpleResult NewSimpleResult(int code, string message, string name = "") {
+ LogHelper.Info(message, name);
return new SimpleResult { resultCode = code, resultMsg = message };
+ }
+
+ public static SimpleResult NewSimpleResult(Exception ex, string preLog = "", int errCode = -1) {
+ LogHelper.InfoEx(ex, preLog);
+ return new SimpleResult { resultCode = errCode, resultMsg = $"鍙戠敓浜哰寮傚父]:{ex.Message}" };
}
/// <summary>
@@ -58,7 +60,7 @@
//public int station_id { get; set; }
/// <summary>
- /// 璇锋眰涓婄嚎/涓嬬嚎鐨勭殑绔欏彴搴撲綅鍚嶇О锛屼緥濡倃ork6銆亀ork8
+ /// 璇锋眰涓婄嚎/涓嬬嚎鐨勭殑绔欏彴搴撲綅鍚嶇О,渚嬪work6,work8
/// </summary>
public string station_name { get; set; }
@@ -77,7 +79,8 @@
public string ResultMsg { get; set; }
}
- public static ReturnResult NewReturnResult(int code, string message) {
+ public static ReturnResult NewReturnResult(int code, string message, bool log = true) {
+ if (log) { LogHelper.Info(message); }
return new ReturnResult { ResultCode = code, ResultMsg = message };
}
@@ -106,8 +109,6 @@
/// 璁㈠崟褰撳墠鐨勭洰鐨勫湴
/// </summary>
public string currentDes { get; set; }
-
-
/// <summary>
/// 褰撳墠鎸囦护
/// </summary>
@@ -151,9 +152,8 @@
}
public class OtherModel {
- #region PDA 鏁版嵁
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫�+ /// 婊＄涓嬬嚎鍏ュ簱
/// </summary>
public class GoodpackOfflineInfo {
/// <summary>
@@ -161,11 +161,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 +177,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 +193,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 +260,27 @@
public string CntrCode { get; set; }
}
- public class UnqualifiedShiftInfo : QualifiedBackInfo {
+ /// <summary>
+ /// 涓嶅悎鏍肩Щ搴撴暟鎹被
+ /// </summary>
+ public class UnqualifiedShiftInfo {
/// <summary>
- /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖�+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [JsonProperty("item_code")]
+ public string ItemCode { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒缂栫爜
+ /// </summary>
+ [JsonProperty("cntr_code")]
+ public string CntrCode { get; set; }
+ /// <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 +290,6 @@
/// </summary>
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
@@ -404,35 +321,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,36 +332,56 @@
[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; }
-
/// <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>
+ /// 鐗╂枡鏁伴噺 (寰呭畾)
+ /// </summary>
+ [JsonProperty("itemNum")]
+ public int ItemNum { get; set; }
+ ///// <summary>
+ ///// 浜х嚎鍙�(寰呭畾,濂借繍绠辨湁2鏉′骇绾�瀵瑰簲2涓笅绾胯揣浣�杩欓噷鏆傚畾涓�3鍜�)
+ ///// </summary>
+ //[JsonProperty("prodLineId")]
+ //public string ProdLineId { get; set; }
}
/// <summary>
@@ -487,91 +395,32 @@
public int Result { get; set; }
/// <summary>
- /// 鏄惁鎴愬姛 True-鎴愬姛锛孎alse锛氬け璐�+ /// 鏄惁鎴愬姛 True-鎴愬姛,False:澶辫触
/// </summary>
[JsonProperty("success")]
public bool Success { get; set; }
/// <summary>
- /// 杩欓噷鏄痵tring绫诲瀷锛屽缁撴灉鐨勬弿杩�+ /// 杩欓噷鏄痵tring绫诲瀷,瀵圭粨鏋滅殑鎻忚堪
/// </summary>
[JsonProperty("data")]
public string Data { get; set; }
}
- public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
+ /// <summary>
+ /// 浠呭綋 Code = 0 琛ㄧず鎴愬姛
+ /// </summary>
+ /// <param name="code"></param>
+ /// <param name="message"></param>
+ /// <param name="log"></param>
+ /// <returns></returns>
+ public static MesResult NewMesResult(int code, string message = "", bool log = true) {
+ if (log) { LogHelper.Info(message); }
return new MesResult {
Result = code,
- Success = code == 0, // 浠呭綋code=0鏃讹紝success=true
+ 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("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; }
- /// <summary>
- /// 鏄惁寮哄埗鍑哄簱
- /// </summary>
- [JsonProperty("force_out")]
- public bool ForcedOut { get; set; }
-
- }
-
- public class PickUpReturnErpInfo {
- public string LocCode { get; set; }
-
}
}
}
--
Gitblit v1.9.1