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 |  591 ++--------------------------------------------------------
 1 files changed, 27 insertions(+), 564 deletions(-)

diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index efdf074..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 };
         }
 
@@ -150,7 +153,7 @@
 
     public class OtherModel {
         /// <summary>
-        /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫�+        /// 婊＄涓嬬嚎鍏ュ簱
         /// </summary>
         public class GoodpackOfflineInfo {
             /// <summary>
@@ -174,7 +177,7 @@
             [JsonProperty("n_num")]
             public int Num { get; set; }
             /// <summary>
-            /// 璧风偣璐т綅淇℃伅锛堣捣鐐硅揣浣嶈揣鍖鸿姹傦細MXCZQ 婊＄鎿嶄綔鍖猴級
+            /// 璧风偣璐т綅淇℃伅 (璧风偣璐т綅璐у尯瑕佹眰:MXCZQ 婊＄鎿嶄綔鍖� 
             /// </summary>
             [JsonProperty("s_start_loc")]
             public string StartLoc { get; set; }
@@ -190,17 +193,17 @@
             [JsonProperty("cntr_code")]
             public string CntrCode { get; set; }
             /// <summary>
-            /// 瀹瑰櫒绫诲瀷锛堝繀椤讳负 '绌烘墭鐩樷� 鎴�鈥樼┖濂借繍绠�锛�+            /// 瀹瑰櫒绫诲瀷 (蹇呴』涓�'绌烘墭鐩樷� 鎴�鈥樼┖濂借繍绠�) 
             /// </summary>
             [JsonProperty("cntr_type")]
             public string CntrType { get; set; }
             /// <summary>
-            /// 缁堢偣搴撳尯缂栫爜锛堟墭鐩樻槸 KTCFQ 绌烘墭瀛樻斁鍖猴紱濂借繍绠辨槸 CXHJQ 绌虹璐ф灦鍖猴級
+            /// 缁堢偣搴撳尯缂栫爜 (鎵樼洏鏄�KTCFQ 绌烘墭瀛樻斁鍖�濂借繍绠辨槸 CXHJQ 绌虹璐ф灦鍖� 
             /// </summary>
             [JsonProperty("end_area")]
             public string EndArea { get; set; }
             /// <summary>
-            /// 璧风偣璐т綅锛堟墭鐩樻槸 KTJBQ 绌烘墭鍏ュ簱鎺ラ┏鍖猴紱濂借繍绠辨槸 KXJBQ 绌虹鍏ュ簱鎺ラ┏鍖猴級
+            /// 璧风偣璐т綅 (鎵樼洏鏄�KTJBQ 绌烘墭鍏ュ簱鎺ラ┏鍖�濂借繍绠辨槸 KXJBQ 绌虹鍏ュ簱鎺ラ┏鍖� 
             /// </summary>
             [JsonProperty("start_loc")]
             public string StartLoc { get; set; }
@@ -272,7 +275,7 @@
             [JsonProperty("cntr_code")]
             public string CntrCode { get; set; }
             /// <summary>
-            /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖猴紙蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖猴級
+            /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖�(蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖� 
             /// </summary>
             [JsonProperty("end_area")]
             public string EndArea { get; set; }
@@ -365,17 +368,17 @@
             [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涓笅绾胯揣浣嶏紝杩欓噷鏆傚畾涓猴細3鍜�锛�+            ///// 浜х嚎鍙�(寰呭畾,濂借繍绠辨湁2鏉′骇绾�瀵瑰簲2涓笅绾胯揣浣�杩欓噷鏆傚畾涓�3鍜�) 
             ///// </summary>
             //[JsonProperty("prodLineId")]
             //public string ProdLineId { get; set; }
@@ -392,13 +395,13 @@
             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; }
@@ -409,555 +412,15 @@
         /// </summary>
         /// <param name="code"></param>
         /// <param name="message"></param>
-        /// <param name="printLog"></param>
+        /// <param name="log"></param>
         /// <returns></returns>
-        public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
+        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 ErpSendOutboundPlanInfo {
-            /// <summary>
-            /// 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
-            /// </summary>
-            public string jhdh { get; set; }
-
-            /// <summary>
-            /// 鍑哄簱鐘舵�
-            /// </summary>
-            public string ckzt { get; set; }
-
-            /// <summary>
-            /// 璁″垝绫诲埆
-            /// </summary>
-            public string jhlb { get; set; }
-
-            /// <summary>
-            /// 鍙傝�鍗曞彿
-            /// </summary>
-            public string ckdh { get; set; }
-
-            /// <summary>
-            /// 杞︾墝鍙�-            /// </summary>
-            public string cph { get; set; }
-
-            /// <summary>
-            /// 杩愯緭鏂瑰紡
-            /// </summary>
-            public string ysfs { get; set; }
-
-            /// <summary>
-            /// 浜у搧鐘舵�
-            /// </summary>
-            public string cpzt { get; set; }
-
-            /// <summary>
-            /// 涔版柇鍗曚綅
-            /// </summary>
-            public string mddw { get; set; }
-
-            /// <summary>
-            /// 浜у搧浠ｇ爜
-            /// </summary>
-            public string cpdm { get; set; }
-
-            /// <summary>
-            /// 浜у搧绫诲埆
-            /// </summary>
-            public string cplb { get; set; }
-
-            /// <summary>
-            /// 浜у搧绫诲埆鏄庣粏
-            /// </summary>
-            public string cplbmx { get; set; }
-
-            /// <summary>
-            /// 鍝佺墝
-            /// </summary>
-            public string pp { get; set; }
-
-            /// <summary>
-            /// 绛夌骇
-            /// </summary>
-            public string dj { get; set; }
-
-            /// <summary>
-            /// 缃愬彿
-            /// </summary>
-            public string gh { get; set; }
-
-            /// <summary>
-            /// 鎵瑰彿
-            /// </summary>
-            public string ph { get; set; }
-
-            /// <summary>
-            /// 鍖呰绫诲瀷
-            /// </summary>
-            public string bzlx { get; set; }
-
-            /// <summary>
-            /// 娲捐鍗曞彿
-            /// </summary>
-            public string pzdh { get; set; }
-
-            /// <summary>
-            /// 娲捐鍗曞崟浣�-            /// </summary>
-            public string pzd_dw { get; set; }
-
-            /// <summary>
-            /// 娲捐鍗曡皟杩愮紪鍙�-            /// </summary>
-            public string pzd_dybh { get; set; }
-
-            /// <summary>
-            /// 娲捐浠舵暟
-            /// </summary>
-            public double pzjs { get; set; }
-
-            /// <summary>
-            /// 娲捐鏁伴噺
-            /// </summary>
-            public decimal pzsl { get; set; }
-
-            /// <summary>
-            /// 娲捐鏃ユ湡(yyyy-mm-dd)
-            /// </summary>
-            public string pz_rq { get; set; }
-
-            /// <summary>
-            /// 娲捐鎿嶄綔鏃ユ湡
-            /// </summary>
-            public long pz_czrq { get; set; }
-
-            /// <summary>
-            /// 娲捐浣滃簾鏍囪
-            /// </summary>
-            public int pz_zfbj { get; set; }
-
-            /// <summary>
-            /// 娲捐浣滃簾鏃ユ湡
-            /// </summary>
-            public long pz_zfrq { get; set; }
-
-            /// <summary>
-            /// 娲捐澶囨敞
-            /// </summary>
-            public string pz_bz { get; set; }
-
-            /// <summary>
-            /// 鍑哄簱鍗曠紪鍙�-            /// </summary>
-            public string ckdbh { get; set; }
-
-            /// <summary>
-            /// 瀹炲彂浠舵暟
-            /// </summary>
-            public double sfjs { get; set; }
-
-            /// <summary>
-            /// 瀹炲彂鏁伴噺
-            /// </summary>
-            public decimal sfsl { get; set; }
-
-            /// <summary>
-            /// 瀹炲彂杞︽暟
-            /// </summary>
-            public int sfcs { get; set; }
-
-            /// <summary>
-            /// 瑁呰溅鏃堕棿
-            /// </summary>
-            public string zcsj { get; set; }
-
-            /// <summary>
-            /// 璁￠噺鍗曚綅
-            /// </summary>
-            public string jldw { get; set; }
-
-            /// <summary>
-            /// 鍙戣揣鏃ユ湡
-            /// </summary>
-            public long fhrq { get; set; }
-
-            /// <summary>
-            /// 浠撳簱浠ｇ爜
-            /// </summary>
-            public string ckdm { get; set; }
-
-            /// <summary>
-            /// 鍙戣揣浜�-            /// </summary>
-            public string fhr { get; set; }
-
-            /// <summary>
-            /// 鎿嶄綔鍛�-            /// </summary>
-            public string czydm { get; set; }
-
-            /// <summary>
-            /// 瀹℃牳浜�-            /// </summary>
-            public string shr_username { get; set; }
-
-            /// <summary>
-            /// 瀹℃牳鏃ユ湡
-            /// </summary>
-            public long shrq { get; set; }
-
-            /// <summary>
-            /// 浣滃簾鏍囪
-            /// </summary>
-            public long zfbj { get; set; }
-
-            /// <summary>
-            /// 浣滃簾鏃ユ湡
-            /// </summary>
-            public long zfrq { get; set; }
-
-            /// <summary>
-            /// 缁撶畻鍗曚綅
-            /// </summary>
-            public string jsdw { get; set; }
-
-            /// <summary>
-            /// 鏀惰揣鍗曚綅
-            /// </summary>
-            public string shdw { get; set; }
-
-            /// <summary>
-            /// 杩愯緭鍗曚綅
-            /// </summary>
-            public string ysdw { get; set; }
-
-            /// <summary>
-            /// 鑱旂郴浜�-            /// </summary>
-            public string lxr { get; set; }
-
-            /// <summary>
-            /// 瑁呭嵏宸�-            /// </summary>
-            public string ry_zxg { get; set; }
-
-            /// <summary>
-            /// 鍙夎溅鍙告満
-            /// </summary>
-            public string ry_ccsj { get; set; }
-
-            /// <summary>
-            /// erp浜よ揣鍗曞彿
-            /// </summary>
-            public string erphx_jhdh { get; set; }
-
-            /// <summary>
-            /// erp鐗╂枡缂栫爜
-            /// </summary>
-            public string erphx_wlbm { get; set; }
-
-            /// <summary>
-            /// erp鐗╂枡鍚嶇О
-            /// </summary>
-            public string erphx_wlmc { get; set; }
-
-            /// <summary>
-            /// erp鍒涘缓鏃ユ湡
-            /// </summary>
-            public string erphx_cjrq { get; set; }
-
-            /// <summary>
-            /// 璐т綅
-            /// </summary>
-            public string hw { get; set; }
-
-            /// <summary>
-            /// 璐т綅鐘舵�
-            /// </summary>
-            public string hwzt { get; set; }
-        }
-
-        public class PickUpReturnErpInfo {
-            /// <summary>
-            /// 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
-            /// </summary>
-            public string jhdh { get; set; }
-
-            /// <summary>
-            /// 鍑哄簱鐘舵�
-            /// </summary>
-            public string ckzt { get; set; }
-
-            /// <summary>
-            /// 璁″垝绫诲埆
-            /// </summary>
-            public string jhlb { get; set; }
-
-            /// <summary>
-            /// 鍙傝�鍗曞彿
-            /// </summary>
-            public string ckdh { get; set; }
-
-            /// <summary>
-            /// 杞︾墝鍙�-            /// </summary>
-            public string cph { get; set; }
-
-            /// <summary>
-            /// 杩愯緭鏂瑰紡
-            /// </summary>
-            public string ysfs { get; set; }
-
-            /// <summary>
-            /// 浜у搧鐘舵�
-            /// </summary>
-            public string cpzt { get; set; }
-
-            /// <summary>
-            /// 涔版柇鍗曚綅
-            /// </summary>
-            public string mddw { get; set; }
-
-            /// <summary>
-            /// 浜у搧浠ｇ爜
-            /// </summary>
-            public string cpdm { get; set; }
-
-            /// <summary>
-            /// 浜у搧绫诲埆
-            /// </summary>
-            public string cplb { get; set; }
-
-            /// <summary>
-            /// 浜у搧绫诲埆鏄庣粏
-            /// </summary>
-            public string cplbmx { get; set; }
-
-            /// <summary>
-            /// 鍝佺墝
-            /// </summary>
-            public string pp { get; set; }
-
-            /// <summary>
-            /// 绛夌骇
-            /// </summary>
-            public string dj { get; set; }
-
-            /// <summary>
-            /// 缃愬彿
-            /// </summary>
-            public string gh { get; set; }
-
-            /// <summary>
-            /// 鎵瑰彿
-            /// </summary>
-            public string ph { get; set; }
-
-            /// <summary>
-            /// 鍖呰绫诲瀷
-            /// </summary>
-            public string bzlx { get; set; }
-
-            /// <summary>
-            /// 娲捐鍗曞彿
-            /// </summary>
-            public string pzdh { get; set; }
-
-            /// <summary>
-            /// 娲捐鍗曞崟浣�-            /// </summary>
-            public string pzd_dw { get; set; }
-
-            /// <summary>
-            /// 娲捐鍗曡皟杩愮紪鍙�-            /// </summary>
-            public string pzd_dybh { get; set; }
-
-            /// <summary>
-            /// 娲捐浠舵暟
-            /// </summary>
-            public double pzjs { get; set; }
-
-            /// <summary>
-            /// 娲捐鏁伴噺
-            /// </summary>
-            public decimal pzsl { get; set; }
-
-            /// <summary>
-            /// 娲捐鏃ユ湡(yyyy-mm-dd)
-            /// </summary>
-            public string pz_rq { get; set; }
-
-            /// <summary>
-            /// 娲捐鎿嶄綔鏃ユ湡
-            /// </summary>
-            public long pz_czrq { get; set; }
-
-            /// <summary>
-            /// 娲捐浣滃簾鏍囪
-            /// </summary>
-            public int pz_zfbj { get; set; }
-
-            /// <summary>
-            /// 娲捐浣滃簾鏃ユ湡
-            /// </summary>
-            public long pz_zfrq { get; set; }
-
-            /// <summary>
-            /// 娲捐澶囨敞
-            /// </summary>
-            public string pz_bz { get; set; }
-
-            /// <summary>
-            /// 鍑哄簱鍗曠紪鍙�-            /// </summary>
-            public string ckdbh { get; set; }
-
-            /// <summary>
-            /// 瀹炲彂浠舵暟
-            /// </summary>
-            public double sfjs { get; set; }
-
-            /// <summary>
-            /// 瀹炲彂鏁伴噺
-            /// </summary>
-            public decimal sfsl { get; set; }
-
-            /// <summary>
-            /// 瀹炲彂杞︽暟
-            /// </summary>
-            public int sfcs { get; set; }
-
-            /// <summary>
-            /// 瑁呰溅鏃堕棿
-            /// </summary>
-            public string zcsj { get; set; }
-
-            /// <summary>
-            /// 璁￠噺鍗曚綅
-            /// </summary>
-            public string jldw { get; set; }
-
-            /// <summary>
-            /// 鍙戣揣鏃ユ湡
-            /// </summary>
-            public long fhrq { get; set; }
-
-            /// <summary>
-            /// 浠撳簱浠ｇ爜
-            /// </summary>
-            public string ckdm { get; set; }
-
-            /// <summary>
-            /// 鍙戣揣浜�-            /// </summary>
-            public string fhr { get; set; }
-
-            /// <summary>
-            /// 鎿嶄綔鍛�-            /// </summary>
-            public string czydm { get; set; }
-
-            /// <summary>
-            /// 瀹℃牳浜�-            /// </summary>
-            public string shr_username { get; set; }
-
-            /// <summary>
-            /// 瀹℃牳鏃ユ湡
-            /// </summary>
-            public long shrq { get; set; }
-
-            /// <summary>
-            /// 浣滃簾鏍囪
-            /// </summary>
-            public long zfbj { get; set; }
-
-            /// <summary>
-            /// 浣滃簾鏃ユ湡
-            /// </summary>
-            public long zfrq { get; set; }
-
-            /// <summary>
-            /// 缁撶畻鍗曚綅
-            /// </summary>
-            public string jsdw { get; set; }
-
-            /// <summary>
-            /// 鏀惰揣鍗曚綅
-            /// </summary>
-            public string shdw { get; set; }
-
-            /// <summary>
-            /// 杩愯緭鍗曚綅
-            /// </summary>
-            public string ysdw { get; set; }
-
-            /// <summary>
-            /// 鑱旂郴浜�-            /// </summary>
-            public string lxr { get; set; }
-
-            /// <summary>
-            /// 瑁呭嵏宸�-            /// </summary>
-            public string ry_zxg { get; set; }
-
-            /// <summary>
-            /// 鍙夎溅鍙告満
-            /// </summary>
-            public string ry_ccsj { get; set; }
-
-            /// <summary>
-            /// erp浜よ揣鍗曞彿
-            /// </summary>
-            public string erphx_jhdh { get; set; }
-
-            /// <summary>
-            /// erp鐗╂枡缂栫爜
-            /// </summary>
-            public string erphx_wlbm { get; set; }
-
-            /// <summary>
-            /// erp鐗╂枡鍚嶇О
-            /// </summary>
-            public string erphx_wlmc { get; set; }
-
-            /// <summary>
-            /// erp鍒涘缓鏃ユ湡
-            /// </summary>
-            public string erphx_cjrq { get; set; }
-
-            /// <summary>
-            /// 璐т綅
-            /// </summary>
-            public string hw { get; set; }
-
-            /// <summary>
-            /// 璐т綅鐘舵�
-            /// </summary>
-            public string hwzt { get; set; }
         }
     }
 }

--
Gitblit v1.9.1