From 1b6bf29ff7daa1987de65940af52f452cabd6881 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 15 七月 2025 17:27:50 +0800
Subject: [PATCH] 优化AGV任务部分日志、货位绑定内部方法

---
 api/ApiModel.cs |  638 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 586 insertions(+), 52 deletions(-)

diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index c995cd7..4a0cb39 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -22,8 +22,10 @@
         /// </summary>
         /// <param name="code"></param>
         /// <param name="message"></param>
+        /// <param name="log"></param>
         /// <returns></returns>
-        public static SimpleResult NewSimpleResult(int code, string message) {
+        public static SimpleResult NewSimpleResult(int code, string message, bool log = true) {
+            if (log) { LogHelper.Info(message); }
             return new SimpleResult { resultCode = code, resultMsg = message };
         }
 
@@ -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>
@@ -260,7 +263,17 @@
         /// <summary>
         /// 涓嶅悎鏍肩Щ搴撴暟鎹被
         /// </summary>
-        public class UnqualifiedShiftInfo : QualifiedBackInfo {
+        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>
@@ -399,9 +412,10 @@
         /// </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
@@ -419,7 +433,8 @@
             public string Message { get; set; }
         }
 
-        public static ErpResult NewErpResult(int code, string message) {
+        public static ErpResult NewErpResult(int code, string message, bool log = true) {
+            if (log) { LogHelper.Info(message); }
             return new ErpResult { Code = code, Message = message };
         }
 
@@ -430,12 +445,274 @@
             /// <summary>
             /// 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
             /// </summary>
+            public string jhdh { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 鍑哄簱鐘舵�
+            /// </summary>
+            public string ckzt { get; set; } = string.Empty;// 闇�杩斿洖
+
+            /// <summary>
+            /// 璁″垝绫诲埆
+            /// </summary>
+            public string jhlb { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 鍙傝�鍗曞彿
+            /// </summary>
+            public string ckdh { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 杞︾墝鍙�+            /// </summary>
+            public string cph { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 杩愯緭鏂瑰紡
+            /// </summary>
+            public string ysfs { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 浜у搧鐘舵�
+            /// </summary>
+            public string cpzt { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 涔版柇鍗曚綅
+            /// </summary>
+            public string mddw { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 浜у搧浠ｇ爜
+            /// </summary>
+            public string cpdm { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 浜у搧绫诲埆
+            /// </summary>
+            public string cplb { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 浜у搧绫诲埆鏄庣粏
+            /// </summary>
+            public string cplbmx { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 鍝佺墝
+            /// </summary>
+            public string pp { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 绛夌骇
+            /// </summary>
+            public string dj { get; set; } = string.Empty;// 闇�杩斿洖
+
+            /// <summary>
+            /// 缃愬彿
+            /// </summary>
+            public string gh { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 鎵瑰彿
+            /// </summary>
+            public string ph { get; set; } = string.Empty;// 闇�杩斿洖
+
+            /// <summary>
+            /// 鍖呰绫诲瀷
+            /// </summary>
+            public string bzlx { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 娲捐鍗曞彿
+            /// </summary>
+            public string pzdh { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 娲捐鍗曞崟浣�+            /// </summary>
+            public string pzd_dw { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 娲捐鍗曡皟杩愮紪鍙�+            /// </summary>
+            public string pzd_dybh { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 娲捐浠舵暟
+            /// </summary>
+            public double pzjs { get; set; } = 0;
+
+            /// <summary>
+            /// 娲捐鏁伴噺
+            /// </summary>
+            public decimal pzsl { get; set; } = 0;
+
+            /// <summary>
+            /// 娲捐鏃ユ湡(yyyy-mm-dd)
+            /// </summary>
+            public string pz_rq { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 娲捐鎿嶄綔鏃ユ湡
+            /// </summary>
+            public long pz_czrq { get; set; } = 0;
+
+            /// <summary>
+            /// 娲捐浣滃簾鏍囪
+            /// </summary>
+            public int pz_zfbj { get; set; } = 0;
+
+            /// <summary>
+            /// 娲捐浣滃簾鏃ユ湡
+            /// </summary>
+            public long pz_zfrq { get; set; } = 0;
+
+            /// <summary>
+            /// 娲捐澶囨敞
+            /// </summary>
+            public string pz_bz { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 鍑哄簱鍗曠紪鍙�+            /// </summary>
+            public string ckdbh { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 瀹炲彂浠舵暟
+            /// </summary>
+            public double sfjs { get; set; } = 0; // 闇�杩斿洖
+
+            /// <summary>
+            /// 瀹炲彂鏁伴噺
+            /// </summary>
+            public decimal sfsl { get; set; } = 0; // 闇�杩斿洖
+
+            /// <summary>
+            /// 瀹炲彂杞︽暟
+            /// </summary>
+            public int sfcs { get; set; } = 0; // 闇�杩斿洖
+
+            /// <summary>
+            /// 瑁呰溅鏃堕棿
+            /// </summary>
+            public string zcsj { get; set; } = string.Empty; // 闇�杩斿洖
+
+            /// <summary>
+            /// 璁￠噺鍗曚綅
+            /// </summary>
+            public string jldw { get; set; } = string.Empty;// 闇�杩斿洖
+
+            /// <summary>
+            /// 鍙戣揣鏃ユ湡
+            /// </summary>
+            public long fhrq { get; set; } = 0; // 闇�杩斿洖
+
+            /// <summary>
+            /// 浠撳簱浠ｇ爜
+            /// </summary>
+            public string ckdm { get; set; } = string.Empty; // 闇�杩斿洖
+
+            /// <summary>
+            /// 鍙戣揣浜�+            /// </summary>
+            public string fhr { get; set; } = string.Empty; // 闇�杩斿洖
+
+            /// <summary>
+            /// 鎿嶄綔鍛�+            /// </summary>
+            public string czydm { get; set; } = string.Empty; // 闇�杩斿洖
+
+            /// <summary>
+            /// 瀹℃牳浜�+            /// </summary>
+            public string shr_username { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 瀹℃牳鏃ユ湡
+            /// </summary>
+            public long shrq { get; set; } = 0;
+
+            /// <summary>
+            /// 浣滃簾鏍囪
+            /// </summary>
+            public long zfbj { get; set; } = 0;
+
+            /// <summary>
+            /// 浣滃簾鏃ユ湡
+            /// </summary>
+            public long zfrq { get; set; } = 0;
+
+            /// <summary>
+            /// 缁撶畻鍗曚綅
+            /// </summary>
+            public string jsdw { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 鏀惰揣鍗曚綅
+            /// </summary>
+            public string shdw { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 杩愯緭鍗曚綅
+            /// </summary>
+            public string ysdw { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 鑱旂郴浜�+            /// </summary>
+            public string lxr { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 瑁呭嵏宸�+            /// </summary>
+            public string ry_zxg { get; set; } = string.Empty; // 闇�杩斿洖
+
+            /// <summary>
+            /// 鍙夎溅鍙告満
+            /// </summary>
+            public string ry_ccsj { get; set; } = string.Empty; // 闇�杩斿洖
+
+            /// <summary>
+            /// erp浜よ揣鍗曞彿
+            /// </summary>
+            public string erphx_jhdh { get; set; } = string.Empty;
+
+            /// <summary>
+            /// erp鐗╂枡缂栫爜
+            /// </summary>
+            public string erphx_wlbm { get; set; } = string.Empty;
+
+            /// <summary>
+            /// erp鐗╂枡鍚嶇О
+            /// </summary>
+            public string erphx_wlmc { get; set; } = string.Empty;
+
+            /// <summary>
+            /// erp鍒涘缓鏃ユ湡
+            /// </summary>
+            public string erphx_cjrq { get; set; } = string.Empty;
+
+            /// <summary>
+            /// 璐т綅
+            /// </summary>
+            public string hw { get; set; } = string.Empty; // 闇�杩斿洖
+
+            /// <summary>
+            /// 璐т綅鐘舵�
+            /// </summary>
+            public string hwzt { get; set; } = string.Empty; // 闇�杩斿洖
+        }
+
+        public class PickUpReturnErpInfo {
+            /// <summary>
+            /// 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
+            /// </summary>
             public string jhdh { get; set; }
 
             /// <summary>
             /// 鍑哄簱鐘舵�
             /// </summary>
-            public string ckzt { get; set; }
+            public string ckzt { get; set; } // 闇�杩斿洖
 
             /// <summary>
             /// 璁″垝绫诲埆
@@ -490,7 +767,7 @@
             /// <summary>
             /// 绛夌骇
             /// </summary>
-            public string dj { get; set; }
+            public string dj { get; set; } // 闇�杩斿洖
 
             /// <summary>
             /// 缃愬彿
@@ -500,7 +777,7 @@
             /// <summary>
             /// 鎵瑰彿
             /// </summary>
-            public string ph { get; set; }
+            public string ph { get; set; } // 闇�杩斿洖
 
             /// <summary>
             /// 鍖呰绫诲瀷
@@ -565,47 +842,47 @@
             /// <summary>
             /// 瀹炲彂浠舵暟
             /// </summary>
-            public double sfjs { get; set; }
+            public double sfjs { get; set; } // 闇�杩斿洖
 
             /// <summary>
             /// 瀹炲彂鏁伴噺
             /// </summary>
-            public decimal sfsl { get; set; }
+            public decimal sfsl { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 瀹炲彂杞︽暟
-            /// </summary>
-            public int sfcs { get; set; }
+            ///// <summary>
+            ///// 瀹炲彂杞︽暟
+            ///// </summary>
+            //public int sfcs { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 瑁呰溅鏃堕棿
-            /// </summary>
-            public string zcsj { get; set; }
+            ///// <summary>
+            ///// 瑁呰溅鏃堕棿
+            ///// </summary>
+            //public string zcsj { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 璁￠噺鍗曚綅
-            /// </summary>
-            public string jldw { get; set; }
+            ///// <summary>
+            ///// 璁￠噺鍗曚綅
+            ///// </summary>
+            //public string jldw { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 鍙戣揣鏃ユ湡
-            /// </summary>
-            public long fhrq { get; set; }
+            ///// <summary>
+            ///// 鍙戣揣鏃ユ湡
+            ///// </summary>
+            //public long fhrq { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 浠撳簱浠ｇ爜
-            /// </summary>
-            public string ckdm { get; set; }
+            ///// <summary>
+            ///// 浠撳簱浠ｇ爜
+            ///// </summary>
+            //public string ckdm { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 鍙戣揣浜�-            /// </summary>
-            public string fhr { get; set; }
+            ///// <summary>
+            ///// 鍙戣揣浜�+            ///// </summary>
+            //public string fhr { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 鎿嶄綔鍛�-            /// </summary>
-            public string czydm { get; set; }
+            ///// <summary>
+            ///// 鎿嶄綔鍛�+            ///// </summary>
+            //public string czydm { get; set; } // 闇�杩斿洖
 
             /// <summary>
             /// 瀹℃牳浜�@@ -647,15 +924,15 @@
             /// </summary>
             public string lxr { get; set; }
 
-            /// <summary>
-            /// 瑁呭嵏宸�-            /// </summary>
-            public string ry_zxg { get; set; }
+            ///// <summary>
+            ///// 瑁呭嵏宸�+            ///// </summary>
+            //public string ry_zxg { get; set; } // 闇�杩斿洖
 
-            /// <summary>
-            /// 鍙夎溅鍙告満
-            /// </summary>
-            public string ry_ccsj { get; set; }
+            ///// <summary>
+            ///// 鍙夎溅鍙告満
+            ///// </summary>
+            //public string ry_ccsj { get; set; } // 闇�杩斿洖
 
             /// <summary>
             /// erp浜よ揣鍗曞彿
@@ -680,17 +957,274 @@
             /// <summary>
             /// 璐т綅
             /// </summary>
-            public string hw { get; set; }
+            public string hw { get; set; } // 闇�杩斿洖
 
             /// <summary>
             /// 璐т綅鐘舵�
             /// </summary>
-            public string hwzt { get; set; }
+            public string hwzt { get; set; } // 闇�杩斿洖
         }
 
-        public class PickUpReturnErpInfo {
-            public string LocCode { get; set; }
+        public class CreateTaskReturnErpInfo {
+            /// <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