From f8d23dcf8d6501482db1a5180325194232afe96c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 18 七月 2025 17:30:09 +0800
Subject: [PATCH] 封装部分业务代码,继续优化日志打印流程

---
 api/ApiHelper.cs | 1226 +++++++++++++++++----------------------------------------
 1 files changed, 375 insertions(+), 851 deletions(-)

diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a61f780..f1adf15 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -2,13 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 
+using HH.WCS.Mobox3.DSZSH.core;
 using HH.WCS.Mobox3.DSZSH.models;
 using HH.WCS.Mobox3.DSZSH.util;
 using HH.WCS.Mobox3.DSZSH.wms;
 
 using Newtonsoft.Json;
-
 using SqlSugar;
+
+using Swashbuckle.Swagger;
 
 using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
 using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
@@ -18,562 +20,348 @@
         /// <summary>
         /// 婊$涓嬬嚎鍏ュ簱
         /// </summary>
-        /// <remarks>
-        /// 浜哄伐锛氫骇绾�=>婊$鎿嶄綔鍖�br/>
-        /// PDA锛氳皟鐢ㄦ帴鍙o紝鍛煎彨AGV<br/>
-        /// AGV锛氭弧绠辨搷浣滃尯==鎼繍==>璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
-        /// </remarks>
-        /// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
+        /// <param name="model"></param>
         /// <returns></returns>
         public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.M婊$涓嬬嚎鍏ュ簱);
-            var taskName = taskInfo.TaskName;
-            var startAreas = taskInfo.StartAreas;
-            var endAreas = taskInfo.EndAreas;
+            var taskInfo = ETask.M婊$涓嬬嚎鍏ュ簱.Info();
+            const string preLog = "API:婊$涓嬬嚎鍏ュ簱:";
+            const string cntrType = "濂借繍绠�;
 
             try {
                 if (model.Num <= 0) {
-                    info = $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬0";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(400, info);
+                    return NewSimpleResult(400, preLog + $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
                 }
 
-                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮").First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�-
+                // 妫�煡璐у搧瀹瑰櫒琛�鏄惁宸茬粡瀛樺湪璐存爣鏈轰紶閫掔殑寰呭叆搴撶墿鏂欎俊鎭�+                // TODO:鏁伴噺,瑙勬牸鏄惁涔熷弬涓庢瘮瀵癸紵
+                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮").First();
                 if (cgDetail == null) {
-                    info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
-                    LogHelper.Info(info);
-                    return NewSimpleResult(1, info);
+                    return NewSimpleResult(1, preLog + $"娌℃湁鍦╗璐у搧鏄庣粏琛╙涓壘鍒癧鐗╂枡缂栫爜='{model.ItemCode}',鎵规鍙�'{model.BatchNo}']鐨勭墿鏂�璇锋鏌�PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭槸鍚︿竴鑷�瑕佹眰:鐗╂枡鐘舵�='寰呮'");
                 }
 
-                var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_CODE == model.StartLoc)
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .First();
-
+                // 鏌ヨ璧风偣璐т綅:鏁伴噺=0
+                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                 if (startLoc == null) {
-                    info = $"锛氭病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛佽姹傦細鏈笂閿併�鏁伴噺=0銆佽揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
                 }
 
-                startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+                // 鍜屾弧鎵樹笅绾垮叆搴撶殑閫昏緫涓�嚧,鐢变簬瀹瑰櫒绉诲姩涓嶄細鏇存敼缁戝畾淇℃伅,鎵�互蹇呴』鍒犻櫎鏃ф暟鎹�+                var old = WCSHelper.GetLocCntrCg(cgDetail.S_CNTR_CODE, skipCgDetail: true);
 
-                var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = startLoc.S_CODE,
-                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
-                    S_CNTR_TYPE = "濂借繍绠�,
-                };
+                // 缁戝畾璐т綅瀹瑰櫒,璧风偣璐т綅褰撳墠鏁伴噺=1
+                var locCntrRel = WCSHelper.BindLocCntr(ref startLoc, cgDetail.S_CNTR_CODE);
+                locCntrRel.S_CNTR_TYPE = cntrType;
 
-                var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .OrderBy(l => new { l.N_LAYER }).First();
-                
+                // 鏌ヨ缁堢偣璐т綅
+                // Order:鎸夎揣浣嶅眰鏁�浠庡皬鍒板ぇ鎺掑垪
+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER }).First();
                 if (endLoc == null) {
-                    info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紝闇�婊¤冻锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
                 }
 
-                LocationHelper.LockStartLoc(ref startLoc);
-                LocationHelper.LockEndLoc(ref endLoc);
-
-                var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+                // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
-                        info = $"鎻掑叆璐т綅瀹瑰櫒缁戝畾琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(locCntrRel);
+                    // 鍒犻櫎/鏇存柊鏃璐т綅/瀹瑰櫒/鐗╂枡]淇℃伅
+                    if (old.LocCntrRel != null && db.Deleteable(old.LocCntrRel).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触!鏁版嵁:{LogObject(old.LocCntrRel)}");
+                    }
+                    if (old.Location != null && db.Updateable(old.Location).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾褰撳墠瀹瑰櫒鏁伴噺]澶辫触!璐т綅='{old.Location.S_CODE}',鏁伴噺=>{old.Location.N_CURRENT_NUM}");
                     }
 
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
+                    // 鎻掑叆鏂扮粦瀹氱殑[璐т綅-瀹瑰櫒]琛�+                    if (db.Insertable(locCntrRel).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鎻掑叆[瀹瑰櫒璐т綅缁戝畾琛╙澶辫触!鏁版嵁:{LogObject(locCntrRel)}");
                     }
 
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+                    }
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
+                    }
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
         /// <summary>
         /// 绌烘墭鍏ュ簱
         /// </summary>
-        /// <remarks>
-        /// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
-        /// 鐢变簬绌烘墭鐩樹竴鑸槸鍑哄簱鍗歌揣鍚庤幏寰楋紝鑰屽嚭搴撴椂娌℃湁鎵嬪姩鍗歌揣鐨勯�杈戯紝鎵�互闇�鍦ㄥ叆搴撶殑鏃跺�鍐嶅垹闄ゆ棫缁戝畾淇℃伅
-        /// </remarks>
-        /// <param name="model">鍖呭惈锛氳捣鐐硅揣浣嶃�瀹瑰櫒鍙枫�瀹瑰櫒绫诲瀷銆佺粓鐐硅揣鍖�/param>
+        /// <param name="model"></param>
         /// <returns></returns>
         public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.K绌烘墭鍏ュ簱);
-            var taskName = taskInfo.TaskName;
-            var startAreas = taskInfo.StartAreas;
-            var endAreas = taskInfo.EndAreas;
-            var cntrType = "鎵樼洏";
+            var taskInfo = ETask.K绌烘墭鍏ュ簱.Info();
+            const string preLog = "API:绌烘墭鍏ュ簱:";
+            const string cntrType = "鎵樼洏";
 
             try {
-                var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_CODE == model.StartLoc)
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .First();
-
+                // 鏌ヨ璧风偣璐т綅:鏁伴噺=0
+                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                 if (startLoc == null) {
-                    info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(1, info);
+                    return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
                 }
 
-                var cntr = db.Queryable<TN_Container>()
-                    .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
-                    .First();
-
+                // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
                 if (cntr == null) {
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
                 }
-                if (cntr.S_TYPE != cntrType) { // 绌烘墭鍏ュ簱
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                if (cntr.S_TYPE != cntrType) {
+                    return NewSimpleResult(3, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}',涓庤緭鍏ョ殑瀹瑰櫒绫诲瀷'{cntrType}'涓嶅悓!");
                 }
+                
+                // 绌虹鍏ュ簱鏃�濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁,鍒犻櫎
+                var old = WCSHelper.GetLocCntrCg(model.CntrCode);
 
-                // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�-                // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙i櫎
-                var cgDetailOld = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_CNTR_CODE == model.CntrCode)
-                    .First();
+                // 缁戝畾璐т綅瀹瑰櫒,璧风偣璐т綅褰撳墠鏁伴噺=1
+                var locCntrRel = WCSHelper.BindLocCntr(ref startLoc, cntr.S_CODE);
+                locCntrRel.S_CNTR_TYPE = cntrType;
 
-                // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
-                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_CNTR_CODE == model.CntrCode)
-                    .First();
-
-                TN_Location locOld = null;
-                if (locCntrRelOld != null) { // 濡傛灉闇�瑙g粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
-                    locOld = db.Queryable<TN_Location>()
-                        .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
-                    if (locOld != null) {
-                        locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
-                        locOld.T_MODIFY = DateTime.Now;
-                    }
-                }
-
-                // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛�-                var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = startLoc.S_CODE,
-                    S_CNTR_CODE = cntr.S_CODE,
-                    S_CNTR_TYPE = cntrType, // 绌烘墭鍏ュ簱
-                };
-
-                startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�-
-                var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
-                    .First();
-
+                // 鏌ヨ缁堢偣璐т綅
+                // Order:灞傛暟浠庝綆鍒伴珮,琛�鍒�+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                 if (endLoc == null) {
-                    info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(4, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
                 }
 
-                LocationHelper.LockStartLoc(ref startLoc);
-                LocationHelper.LockEndLoc(ref endLoc);
-                var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+                // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
+                    if (old.CgDetail != null && db.Deleteable(old.CgDetail).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触!鏁版嵁:{LogObject(old.CgDetail)}");
                     }
 
-                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
+                    if (old.LocCntrRel != null && db.Deleteable(old.LocCntrRel).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触!鏁版嵁:{LogObject(old.LocCntrRel)}");
                     }
 
-                    if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+                    if (old.Location != null && db.Updateable(old.Location).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾褰撳墠瀹瑰櫒鏁伴噺]澶辫触!璐т綅='{old.Location.S_CODE}',鏁伴噺=>{old.Location.N_CURRENT_NUM}");
                     }
 
-                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+                    if (db.Insertable(locCntrRel).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鎻掑叆[璐т綅瀹瑰櫒缁戝畾琛╙澶辫触!鏁版嵁:{LogObject(locCntrRel)}");
                     }
 
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+                    }
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
+                    }
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info); 
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
         /// <summary>
-        /// 绌虹鍏ュ簱(濂借繍绠�
+        /// 绌虹鍏ュ簱
         /// </summary>
-        /// <remarks>
-        /// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
-        /// 鐢变簬绌虹涓�埇鏄嚭搴撳嵏璐у悗鑾峰緱锛岃�鍑哄簱鏃舵病鏈夋墜鍔ㄥ嵏璐х殑閫昏緫锛屾墍浠ラ渶瑕佸湪鍏ュ簱鐨勬椂鍊欏啀鍒犻櫎鏃х粦瀹氫俊鎭�-        /// </remarks>
         /// <returns></returns>
         public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.K绌虹鍏ュ簱);
-            var taskName = taskInfo.TaskName;
-            var startAreas = taskInfo.StartAreas;
-            var endAreas = taskInfo.EndAreas;
+            var taskInfo = ETask.K绌虹鍏ュ簱.Info();
+            const string preLog = "API:绌虹鍏ュ簱:";
             const string cntrType = "濂借繍绠�;
 
             try {
-                var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_CODE == model.StartLoc)
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓�-                    .First();
-
+                // 鏌ヨ璧风偣璐т綅:鏁伴噺=0
+                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                 if (startLoc == null) {
-                    info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
                 }
 
-                var cntr = db.Queryable<TN_Container>()
-                    .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
-                    .First();
-
+                // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
                 if (cntr == null) {
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(1, $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
                 }
                 if (cntr.S_TYPE != cntrType) {
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷鏄�{cntr.S_TYPE},涓嶆槸'{cntrType}'!");
                 }
 
-                // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�-                // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙i櫎
-                var cgDetailOld = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+                // 绌虹鍏ュ簱鏃�濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁,鍒犻櫎
+                var old = WCSHelper.GetLocCntrCg(model.CntrCode);
 
-                // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
-                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
+                // 缁戝畾璐т綅瀹瑰櫒,璧风偣璐т綅褰撳墠鏁伴噺=1
+                var locCntrRel = WCSHelper.BindLocCntr(ref startLoc, model.CntrCode);
+                locCntrRel.S_CNTR_TYPE = cntrType;
 
-                TN_Location locOld = null;
-                if (locCntrRelOld != null) { // 濡傛灉闇�瑙g粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
-                    locOld = db.Queryable<TN_Location>()
-                        .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
-                    if (locOld != null) {
-                        locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
-                    }
-                }
-
-                // 缁戝畾璐т綅鍜屽鍣ㄥ彿
-                var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = startLoc.S_CODE,
-                    S_CNTR_CODE = cntr.S_CODE,
-                    S_CNTR_TYPE = cntrType,
-                };
-
-                startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�-
-                var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => endAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .OrderBy(l => new { l.N_LAYER }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�-                    .First();
-
+                // 鏌ヨ缁堢偣璐т綅
+                // Order:灞傛暟浠庝綆鍒伴珮,琛�鍒�+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                 if (endLoc == null) {
-                    info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(4, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
                 }
 
-                var cntId = locCntrRel.S_CNTR_CODE;
-
-                LocationHelper.LockStartLoc(ref startLoc);
-                LocationHelper.LockEndLoc(ref endLoc);
-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
 
                 using (var tran = db.Ado.UseTran()) {
-                    // 瀛樺湪鏃с�鐗╂枡鏄庣粏銆戣〃鏃讹紝鍒犻櫎鏃ц〃
-                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
+                    if (old.CgDetail != null && db.Deleteable(old.CgDetail).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触!鏁版嵁:{LogObject(old.CgDetail)}");
                     }
-                    // 瀛樺湪鏃с�璐т綅瀹瑰櫒缁戝畾銆戣〃鏃讹紝鍒犻櫎鏃ц〃
-                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
+                    if (old.LocCntrRel != null && db.Deleteable(old.LocCntrRel).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触!鏁版嵁:{LogObject(old.LocCntrRel)}");
+                    }
+                    if (old.Location != null && db.Updateable(old.Location).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾褰撳墠瀹瑰櫒鏁伴噺]澶辫触!璐т綅='{old.Location.S_CODE}',鏁伴噺=>{old.Location.N_CURRENT_NUM}");
                     }
 
-                    if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
+                    if (db.Insertable(locCntrRel).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鎻掑叆[璐т綅瀹瑰櫒鍏崇郴]澶辫触:" + LogObject(locCntrRel));
                     }
 
-                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+                    }
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
+                    }
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
         /// <summary>
         /// 绌烘墭涓婄嚎鍑哄簱
         /// </summary>
-        /// <remarks>
-        /// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩�-        /// </remarks>
-        /// <param name="model">鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
+        /// <param name="model"></param>
         /// <returns></returns>
         public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.K绌烘墭涓婄嚎鍑哄簱);
-            var taskName = taskInfo.TaskName;
-            var startAreas = taskInfo.StartAreas;
-            var endAreas = taskInfo.EndAreas;
+            var taskInfo = ETask.K绌烘墭涓婄嚎鍑哄簱.Info();
+            const string preLog = "API:绌烘墭涓婄嚎鍑哄簱:";
             const string cntrType = "鎵樼洏";
 
             try {
-                var cntr = db.Queryable<TN_Container>()
-                    .Where(c => c.S_CODE == model.CntId)
-                    .First();
-
+                // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntId).First();
                 if (cntr == null) {
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(1, info);
+                    return NewSimpleResult(1, $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
                 }
-                if (cntr.S_TYPE != cntrType) { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                if (cntr.S_TYPE != cntrType) {
+                    return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷鏄�{cntr.S_TYPE},涓嶆槸'{cntrType}'!");
                 }
 
                 var needUpdateContainer = false;
                 if (string.IsNullOrEmpty(cntr.S_SPEC)) {
-                    // TEMP 鐩墠娴佺▼锛氬鏋滃鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝鏍规嵁娴佺▼鐨勭墿鏂欎俊鎭啓鍏�-                    // 寰呭畾锛氬悗闈㈠彲鑳戒細鏇存敼娴佺▼锛屾垨鑰呯敤鍏朵粬淇℃伅锛堝鐗╂枡绫诲瀷/瑙勬牸锛変綔涓哄鍣ㄧ殑瑙勬牸
+                    // TEMP 鐩墠娴佺▼:濡傛灉瀹瑰櫒琛ㄤ腑瑙勬牸 (鐗╂枡缂栫爜) 涓虹┖,鏍规嵁娴佺▼鐨勭墿鏂欎俊鎭啓鍏�+                    // 寰呭畾:鍚庨潰鍙兘浼氭洿鏀规祦绋�鎴栬�鐢ㄥ叾浠栦俊鎭�(濡傜墿鏂欑被鍨�瑙勬牸) 浣滀负瀹瑰櫒鐨勮鏍� 
                     needUpdateContainer = true;
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓�瑙勬牸锛堢墿鏂欑紪鐮侊級涓虹┖锛屽皢鐗╂枡缂栫爜'{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
-                    LogHelper.Info(info);
-
                     cntr.S_SPEC = model.ItemCode;
+                    LogHelper.Info($"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓璠瑙勬牸(鐗╂枡缂栫爜)]涓虹┖,灏嗙墿鏂欑紪鐮�{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�);
                 }
                 else if (cntr.S_SPEC != model.ItemCode) {
-                    info = $"瀹瑰櫒'{model.CntId}'宸茬粡涓庣墿鏂欑被鍨�{cntr.S_SPEC}'缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂�{model.ItemCode}'";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, $"瀹瑰櫒'{model.CntId}'宸茬粡涓庣墿鏂欑被鍨�{cntr.S_SPEC}'缁戝畾,鏃犳硶鐢ㄤ簬瑁呰浇鐗╂枡'{model.ItemCode}'!");
                 }
 
-                var startLoc = db.Queryable<TN_Location>()
-                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
-                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 1)
-                    .First();
-
+                var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where((l, c) => taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
                 if (startLoc == null) {
-                    info = $"鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=1;鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)},缁戝畾瀹瑰櫒缂栫爜='{model.CntId}',缁戝畾瀹瑰櫒绫诲瀷='{cntrType}'");
                 }
 
-                var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => endAreas.Contains(l.S_AREA_CODE)) 
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .First();
-
+                // 鏌ヨ缁堢偣璐т綅
+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                 if (endLoc == null) {
-                    info = $"鎵句笉鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(4, info);
+                    return NewSimpleResult(5, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
                 }
 
-                var cntId = model.CntId;
-
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, model.CntId, taskInfo.TaskName);
 
                 cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�                 cntr.T_MODIFY = DateTime.Now;
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (needUpdateContainer) {
-                        if (db.Updateable<TN_Container>(cntr)
-                            .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
-                            tran.RollbackTran();
-                            info = $"鏇存柊琛ㄥ鍣ㄨ〃澶辫触锛� + JsonConvert.SerializeObject(cntr);
-                            LogHelper.Info(info);
-                            return NewSimpleResult(500, info);
-                        }
+                    if (needUpdateContainer && db.Updateable(cntr).UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
+                        return NewSimpleResult(500, preLog + $"鏇存柊[瀹瑰櫒琛╙澶辫触!鏁版嵁:{LogObject(cntr)}");
                     }
 
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
                     }
-
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
                     }
-
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
@@ -584,104 +372,56 @@
         /// <returns></returns>
         public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.K绌虹涓婄嚎鍑哄簱);
-            var taskName = taskInfo.TaskName;
-            var startAreas = taskInfo.StartAreas;
-            var endAreas = taskInfo.EndAreas;
+            var taskInfo = ETask.K绌虹涓婄嚎鍑哄簱.Info();
+            const string preLog = "API:绌虹涓婄嚎鍑哄簱:";
             const string cntrType = "濂借繍绠�;
 
             try {
-                var cntr = db.Queryable<TN_Container>()
-                    .Where(c => c.S_CODE == model.CntId)
-                    .First();
-
+                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntId).First();
                 if (cntr == null) {
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(1, info);
+                    return NewSimpleResult(1, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
                 }
                 if (cntr.S_TYPE != cntrType) {
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷={cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷='{cntr.S_TYPE}',涓嶆槸'{cntrType}'!");
                 }
 
-                var startLoc = db.Queryable<TN_Location>()
-                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
-                    .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "濂借繍绠�)
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 1)
-                    .First();
-
+                var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where((l, c) => taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
                 if (startLoc == null) {
-                    info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1,鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)},缁戝畾瀹瑰櫒缂栫爜='{model.CntId}',缁戝畾瀹瑰櫒绫诲瀷='{cntrType}'");
                 }
 
-                var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => endAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .First();
-
+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                 if (endLoc == null) {
-                    info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(4, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
                 }
 
-                var cntId = model.CntId;
-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�-
+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, model.CntId, taskInfo.TaskName);
+                
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
-                        it.N_LOCK_STATE,
-                        it.S_LOCK_STATE,
-                        it.S_LOCK_OP,
-                        it.T_MODIFY
-                    }).ExecuteCommand() <= 0) {
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+                    }
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
+                    }
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
-                        it.N_LOCK_STATE,
-                        it.S_LOCK_STATE,
-                        it.S_LOCK_OP,
-                        it.T_MODIFY
-                    }).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
@@ -692,67 +432,30 @@
         /// <returns></returns>
         public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.C鎶芥鍚堟牸鍥炲簱);
-            var taskName = taskInfo.TaskName;
-            var startAreas = taskInfo.StartAreas;
-            var endAreas = taskInfo.EndAreas;
+            var taskInfo = ETask.C鎶芥鍚堟牸鍥炲簱.Info();
+            const string preLog = "API:鎶芥鍚堟牸鍥炲簱";
 
             try {
                 var cgDetail = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
-                    .First();
-
+                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode).First();
                 if (cgDetail == null) {
-                    info = "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model);
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, preLog + "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡:" + LogObject(model));
                 }
 
-                var locCntrRel = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
-                    .First();
-
+                var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE).First();
                 if (locCntrRel == null) {
-                    info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪");
                 }
 
-                var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(l => l.N_CURRENT_NUM == 1)
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
-                    .First();
-
+                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == locCntrRel.S_LOC_CODE && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).First();
                 if (startLoc == null) {
-                    info = $"娌℃湁鎵惧埌瀹瑰櫒{model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(4, info);
+                    return NewSimpleResult(4, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1,鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
                 }
 
-                TN_Location endLoc = null;
-                if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
-                    endAreas = taskInfo.EndAreas_Pallet;
-                    endLoc = db.Queryable<TN_Location>()
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
-                    .Where(l => l.N_CURRENT_NUM == 0).First();
-                }
-                else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
-                    endAreas = taskInfo.EndAreas_Goodpack;
-                    endLoc = db.Queryable<TN_Location>().Where(l => startAreas.Contains(l.S_AREA_CODE)).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => l.N_CURRENT_NUM == 0).First();
-                }
-                else {
-                    return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
-                }
-
+                var endAreas = locCntrRel.S_CNTR_CODE == "鎵樼洏" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                 if (endLoc == null) {
-                    info = $"娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(endAreas)}");
                 }
 
                 cgDetail.N_ITEM_STATE = 0;
@@ -760,50 +463,38 @@
                 cgDetail.T_MODIFY = DateTime.Now;
 
                 var cntId = locCntrRel.S_CNTR_CODE;
-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
 
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
+                    if (db.Updateable(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[鐗╂枡鏄庣粏琛╙澶辫触!鐗╂枡鍙�'{cgDetail.S_ITEM_CODE}',鐗╂枡鐘舵�=>'鍚堟牸'");
                     }
 
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+                    }
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
+                    }
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
@@ -814,124 +505,70 @@
         /// <returns></returns>
         public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            const ETask eTask = ETask.C鎶芥涓嶅悎鏍肩Щ搴�
-            var taskName = Settings.GetTaskInfo(eTask).TaskName;
-            var startAreas = Settings.GetTaskInfo(eTask).StartAreas;
-            var endAreas = Settings.GetTaskInfo(eTask).EndAreas;
+            var taskInfo = ETask.C鎶芥涓嶅悎鏍肩Щ搴�Info();
+            const string preLog = "API:鎶芥涓嶅悎鏍肩Щ搴�";
 
             try {
-                if (!startAreas.Contains(model.EndArea)) {
-                    info = $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(1, info);
+                if (!taskInfo.EndAreas.Contains(model.EndArea)) {
+                    return NewSimpleResult(1, preLog + $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠�闇�:璐у尯={LogObject(taskInfo.EndAreas)}");
                 }
 
                 var cgDetail = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
-                    .First();
-
+                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode).First();
                 if (cgDetail == null) {
-                    info = $"娌℃湁鍦ㄧ墿鏂欐槑缁嗚〃涓紝鎵惧埌鐗╂枡缂栫爜={model.ItemCode}銆佸鍣ㄧ紪鐮�{model.CntrCode}鐨勭墿鏂�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, preLog + $"娌℃湁鍦╗鐗╂枡鏄庣粏琛╙涓壘鍒扮墿鏂�瑕佹眰:鐗╂枡缂栫爜='{model.ItemCode}',瀹瑰櫒缂栫爜='{model.CntrCode}'");
                 }
 
-                var locCntrRel = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
-                    .First();
-
+                var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE).First();
                 if (locCntrRel == null) {
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"鍦╗璐т綅瀹瑰櫒鍏崇郴琛╙涓病鏈夋壘鍒板鍣�{model.CntrCode}'!");
                 }
 
-                var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
-                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(l => l.N_CURRENT_NUM == 1)
-                    .First();
-
+                // 鏌ヨ璧风偣璐т綅:鏁伴噺=1
+                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == locCntrRel.S_LOC_CODE && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).First();
                 if (startLoc == null) {
-                    info = $"璧风偣璐т綅' {locCntrRel.S_LOC_CODE} '涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽 {string.Join(", ", startAreas)} ]";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{locCntrRel.S_LOC_CODE}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=1;鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
                 }
 
-                var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_AREA_CODE == model.EndArea)
-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(a => a.N_CURRENT_NUM == 0)
-                    .First();
-
+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_AREA_CODE == model.EndArea && l.N_CURRENT_NUM == 0).First();
                 if (endLoc == null) {
-                    info = $"鍦ㄧ粓鐐硅揣鍖�{model.EndArea}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯='{model.EndArea}'");
                 }
 
                 cgDetail.N_ITEM_STATE = 2;
                 cgDetail.S_ITEM_STATE = "涓嶅悎鏍�;
 
-                var cntId = locCntrRel.S_CNTR_CODE;
-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
-                        new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
+                    if (db.Updateable(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'涓嶅悎鏍�澶辫触";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璐у搧鏄庣粏琛╙澶辫触!鐗╂枡鍙�'{cgDetail}',鐗╂枡鐘舵�=>'{cgDetail.S_ITEM_STATE}'");
                     }
 
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
-                        it.N_LOCK_STATE,
-                        it.S_LOCK_STATE,
-                        it.S_LOCK_OP,
-                        it.T_MODIFY
-                    }).ExecuteCommand() <= 0) {
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+                    }
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
+                    }
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
-                        it.N_LOCK_STATE,
-                        it.S_LOCK_STATE,
-                        it.S_LOCK_OP,
-                        it.T_MODIFY
-                    }).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
@@ -942,125 +579,71 @@
         /// <returns></returns>
         public static SimpleResult RestBack(RestBackInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.W灏炬枡鍥炲簱);
-            var taskName = taskInfo.TaskName;
-            var startAreas = taskInfo.StartAreas;
-            List<string> endAreas = null;
+            var taskInfo = ETask.W灏炬枡鍥炲簱.Info();
+            const string preLog = "API:灏炬枡鍥炲簱:";
             
             try {
-                var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_CODE == model.StartLoc)
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(l => l.N_CURRENT_NUM == 1)
-                    .First();
-
+                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1).First();
                 if (startLoc == null) {
-                    info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�鏈夎揣鐗�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(2, $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=1");
                 }
 
-                var locCntrRel = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_LOC_CODE == model.StartLoc)
-                    .First();
-
+                var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == model.StartLoc).First();
                 if (locCntrRel == null) {
-                    info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}鎵�粦瀹氱殑瀹瑰櫒";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}鎵�粦瀹氱殑瀹瑰櫒");
                 }
 
-                TN_Location endLoc = null;
-                if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
-                    endAreas = taskInfo.EndAreas_Pallet;
-                    endLoc = db.Queryable<TN_Location>()
-                        .Where(l => endAreas.Contains(l.S_AREA_CODE))
-                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                        .Where(l => l.N_CURRENT_NUM == 0)
-                        .First();
-                }
-                else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�){
-                    endAreas = taskInfo.EndAreas_Goodpack;
-                    endLoc = db.Queryable<TN_Location>()
-                        .Where(l => endAreas.Contains(l.S_AREA_CODE))
-                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                        .Where(l => l.N_CURRENT_NUM == 0)
-                        .First();
-                }
-
+                var endAreas = locCntrRel.S_CNTR_CODE == "鎵樼洏" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
+                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                 if (endLoc == null) {
-                    info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(endAreas)}");
                 }
 
                 var cntId = locCntrRel.S_CNTR_CODE;
 
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+                WCSHelper.LockStartLoc(ref startLoc);
+                WCSHelper.LockEndLoc(ref endLoc);
+                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
-                        it.N_LOCK_STATE,
-                        it.S_LOCK_STATE,
-                        it.S_LOCK_OP,
-                        it.T_MODIFY
-                    }).ExecuteCommand() <= 0) {
+                    //if (db.Insertable(locCntrRel).ExecuteCommand() <= 0) {
+                    //    tran.RollbackTran();
+                    //    return NewSimpleResult(500, preLog + $"鎻掑叆[瀹瑰櫒璐т綅缁戝畾琛╙澶辫触!鏁版嵁:{LogObject(locCntrRel)}");
+                    //}
+
+                    // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
+                        return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+                    }
+                    if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触!缁堢偣='{endLoc.S_CODE}',閿佺姸鎬�>'鍏ュ簱閿�");
+                    }
+                    if (db.Insertable(task).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                     }
 
-                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
-                        it.N_LOCK_STATE,
-                        it.S_LOCK_STATE,
-                        it.S_LOCK_OP,
-                        it.T_MODIFY
-                    }).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
-                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                        LogHelper.Info(info);
-                        return NewSimpleResult(500, info);
-                    }
-
+                    // 鎻愪氦鏁版嵁搴撴洿鏀�                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(-1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
         /// <summary>
-        /// 鎴愬搧鑳跺嚭搴�PDA) 寰呭畾锛屾殏鏃朵笉闇�姝ゅ姛鑳�+        /// 鎴愬搧鑳跺嚭搴�PDA) 寰呭畾,鏆傛椂涓嶉渶瑕佹鍔熻兘
         /// </summary>
-        /// <remarks>
-        /// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙g敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
-        /// </remarks>
         /// <param name="model"></param>
         /// <returns></returns>
         public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�;
-            var taskName = taskInfo.TaskName;
+            var taskInfo = ETask.C鎴愬搧鑳跺嚭搴�Info();
+            const string preLog = "API:鎴愬搧鑳跺嚭搴�";
 
             try {
                 var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1068,9 +651,7 @@
                 var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
 
                 if (cgDetailList.Count == 0) {
-                    info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�);
                 }
 
                 var order = new TN_Outbound_Order {
@@ -1095,31 +676,23 @@
                 }
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+                    if (db.Insertable(order).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(2, info);
+                        return NewSimpleResult(2, preLog + "鐢熸垚鍑哄簱鍗曞け璐�" + LogObject(order));
                     }
 
-                    if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+                    if (db.Insertable(detailList).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(4, preLog + "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�" + LogObject(detailList));
                     }
 
                     tran.CommitTran();
                 }
 
-                info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
-                LogHelper.Info(info);
-                return NewSimpleResult(0, info);
+                return NewSimpleResult(0, preLog + "鐢熸垚鍑哄簱鍗曟垚鍔�);
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
@@ -1129,10 +702,8 @@
         /// <returns></returns>
         public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
-
-            var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�;
-            var taskName = taskInfo.TaskName;
+            var taskInfo = ETask.C鎴愬搧鑳跺嚭搴�Info();
+            const string preLog = "API:鎴愬搧鑳跺嚭搴�";
 
             try {
                 var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1140,9 +711,7 @@
                 var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
 
                 if (cgDetailList.Count == 0) {
-                    info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
-                    LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(3, preLog + $"娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�);
                 }
 
                 var order = new TN_Outbound_Order {
@@ -1167,31 +736,23 @@
                 }
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+                    if (db.Insertable(order).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
-                        LogHelper.Info(info);
-                        return NewSimpleResult(2, info);
+                        return NewSimpleResult(2, preLog + "鐢熸垚鍑哄簱鍗曞け璐�" + LogObject(order));
                     }
 
-                    if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+                    if (db.Insertable(detailList).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
-                        LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(4, preLog + "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�" + LogObject(detailList));
                     }
 
                     tran.CommitTran();
                 }
 
-                info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
-                LogHelper.Info(info);
-                return NewSimpleResult(0, info);
+                return NewSimpleResult(0, preLog + "鐢熸垚鍑哄簱鍗曟垚鍔�);
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(ex, preLog);
             }
         }
 
@@ -1199,7 +760,6 @@
             var db = new SqlHelper<object>().GetInstance();
             var result = new List<TN_CG_Detail>();
             var targetNum = qty;
-            var info = "";
             try {
                 var targetCg = db.Queryable<TN_CG_Detail>()
                     .Where(a => a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo)
@@ -1211,13 +771,13 @@
                     return result;
                 }
 
-                // NOTE 鏍规嵁鎬婚噺閫塪etail鏃讹紝鏄惁闇�鑰冭檻璐т綅鐨勯珮浣庯紵
+                // NOTE 鏍规嵁鎬婚噺閫塪etail鏃�鏄惁闇�鑰冭檻璐т綅鐨勯珮浣庯紵
 
                 var sortedMaterials = new List<TN_CG_Detail>();
 
                 var cntrTypeList = new List<string>();
                 if (cntrType == "") {
-                    cntrTypeList = new List<string> { "鎵樼洏", "濂借繍绠� }; // 涓嶆寚瀹氭墭鐩樼被鍨嬶紝浜岃�鍧囧彲
+                    cntrTypeList = new List<string> { "鎵樼洏", "濂借繍绠� }; // 涓嶆寚瀹氭墭鐩樼被鍨�浜岃�鍧囧彲
                 }
                 else {
                     cntrTypeList.Add(cntrType);
@@ -1263,7 +823,6 @@
                 }
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
                 return result;
             }
@@ -1276,119 +835,94 @@
         }
 
         /// <summary>
-        /// 鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾锛堝彧閽堝濂借繍绠憋級
+        /// 鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾 (鍙拡瀵瑰ソ杩愮) 
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
         public static MesResult CgInfoSync(CgInfoSyncInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var info = "";
+            const string preLog = "API:鍗氬疄涓嬪彂鐗╂枡淇℃伅:";
+            const string cntrType = "濂借繍绠�;
 
             try {
                 if (string.IsNullOrEmpty(model.ItemCode)) {
-                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氱墿鏂欑紪鐮侊紙itemCode锛変笉鑳戒负绌�;
-                    LogHelper.Info(info);
-                    return NewMesResult(400, info);
+                    return NewMesResult(400, preLog + $"鐗╂枡缂栫爜'{model.ItemCode}'涓嶈兘涓虹┖!");
                 }
                 if (string.IsNullOrEmpty(model.CntrCode)) {
-                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氬鍣ㄧ紪鐮侊紙CntrCode锛変笉鑳戒负绌�;
-                    LogHelper.Info(info);
-                    return NewMesResult(400, info);
+                    return NewMesResult(400, preLog + $"瀹瑰櫒缂栫爜'{model.CntrCode}'涓嶈兘涓虹┖!");
                 }
                 if (string.IsNullOrEmpty(model.BatchNo)) {
-                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氭壒娆″彿锛圔atchNo锛変笉鑳戒负绌�;
-                    LogHelper.Info(info);
-                    return NewMesResult(400, info);
+                    return NewMesResult(400, preLog + $"鎵规鍙�{model.BatchNo}'涓嶈兘涓虹┖!");
                 }
                 if (model.ItemNum <= 0) {
-                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氳揣鍝佹暟閲忥紙ItemNum锛夊簲璇ュぇ浜�0";
-                    LogHelper.Info(info);
-                    return NewMesResult(400, info);
+                    return NewMesResult(400, preLog + $"鐗╂枡鏁伴噺'{model.ItemNum}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
                 }
 
-                // TEMP 鐩墠娴佺▼锛氬鍗氬疄涓嬪彂鐨勪俊鎭篃杩涜妫�煡锛屾湭鎵惧埌灏辨姤閿欙紝鍚庨潰鏈夐渶姹傚啀鏇存敼
+                // TEMP 鐩墠娴佺▼:瀵瑰崥瀹炰笅鍙戠殑淇℃伅涔熻繘琛屾鏌�鏈壘鍒板氨鎶ラ敊,鍚庨潰鏈夐渶姹傚啀鏇存敼
                 var cntr = db.Queryable<TN_Container>()
-                    .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+                    .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█,S_CODE灏辨槸涓婚敭,缁存姢鏃跺繀瀹氬敮涓�                     .First();
 
                 if (cntr == null) {
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
-                    LogHelper.Info(info);
-                    return NewMesResult(1, info);
+                    return NewMesResult(1, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
                 }
-                if (cntr.S_TYPE != "濂借繍绠�) {
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌褰撳墠瀹瑰櫒绫诲瀷'濂借繍绠�涓嶅悓锛�;
-                    LogHelper.Info(info);
-                    return NewMesResult(2, info);
+                if (cntr.S_TYPE != cntrType) {
+                    return NewMesResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}',涓庡綋鍓嶅鍣ㄧ被鍨�{cntrType}'涓嶅悓!");
                 }
 
-                // 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑锛堟鏃舵墭鐩樻病鏈変笌浜х嚎澶勭殑璐т綅缁戝畾锛�+                // 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑 (姝ゆ椂鎵樼洏娌℃湁涓庝骇绾垮鐨勮揣浣嶇粦瀹� 
                 var detail = new TN_CG_Detail {
                     S_ITEM_CODE = model.ItemCode, // NOT NULL
                     S_ITEM_NAME = model.ItemName, 
-                    S_CNTR_CODE = model.CntrCode, // NOT NULL 鏂欑缂栧彿锛堝緟瀹氾紝鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙戯級
+                    S_CNTR_CODE = model.CntrCode, // NOT NULL 鏂欑缂栧彿 (寰呭畾,鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙� 
                     S_BATCH_NO = model.BatchNo,   // NOT NULL
                     S_STANDARD = model.Standard,
                     S_NET_WEIGHT = model.NetWeight,
                     S_QUALITY_GRADE = model.QualityGrade,
                 };
 
-                // 浜х嚎鍙风殑閫昏緫寰呭畾锛岀幇鍦ㄨ瀹氫负鍗氬疄涓嬪彂浜х嚎鍙凤紝鐪嬪悗缁渶姹傚彉鏇�-                // 濂借繍绠辫捣鐐逛负浜х嚎璐т綅锛屼汉宸ュ皢濂借繍绠变粠浜х嚎涓婂彇涓嬶紝鎼繍鍒版弧濂借繍绠辨搷浣滃尯
+                // 浜х嚎鍙风殑閫昏緫寰呭畾,鐜板湪璁惧畾涓哄崥瀹炰笅鍙戜骇绾垮彿,鐪嬪悗缁渶姹傚彉鏇�+                // 濂借繍绠辫捣鐐逛负浜х嚎璐т綅,浜哄伐灏嗗ソ杩愮浠庝骇绾夸笂鍙栦笅,鎼繍鍒版弧濂借繍绠辨搷浣滃尯
                 //var startLocCode = "";
                 //if (model.ProdLineId.Trim() == "3") {
                 //    startLocCode = "";
                 //}
 
                 //if (model.ProdLineId.Trim() != "3" || model.ProdLineId.Trim() != "4") {
-                //    info = $"涓嶅悎娉曠殑浜х嚎鍙穥model.ProdLineId}锛氬ソ杩愮浜х嚎鍙峰繀椤讳负 3 鎴�4";
+                //    info = $"涓嶅悎娉曠殑浜х嚎鍙穥model.ProdLineId}:濂借繍绠变骇绾垮彿蹇呴』涓�3 鎴�4";
                 //    LogHelper.Info(info);
                 //    return NewMesResult(2, info);
                 //}
 
-                using (var tran = db.Ado.UseTran()) {
-                    if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
-                        tran.RollbackTran();
-                        info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
-                        return NewMesResult(500, info);
-                    }
-
-                    tran.CommitTran();
+                if (db.Insertable(detail).ExecuteCommand() <= 0) {
+                    return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙澶辫触!鏁版嵁:{LogObject(detail)}");
                 }
 
-                info = "鎻掑叆鐗╂枡淇℃伅鎴愬姛";
-                return NewMesResult(0, info);
+                return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙鎴愬姛!鏁版嵁:{LogObject(detail)}");
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewMesResult(-1, info);
+                return NewMesResult(-1, preLog + $"鍙戠敓浜嗗紓甯�{ex.Message}\n\n{ex.StackTrace}\n");
             }
         }
 
         public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
             var db = new SqlHelper<object>().GetInstance();
             var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
-            var info = "";
+            const string preLog = "API:ERP涓嬪彂鍑哄簱璁″垝鍗�";
             try {
-                // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
                 if (model.pzjs <= 0) {
-                    info = $"鐗╂枡鏁伴噺(pzjs){model.pzjs}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
-                    LogHelper.Info(info);
-                    return NewErpResult(400, info);
+                    return NewErpResult(400, preLog + $"鐗╂枡鏁伴噺(pzjs)'{model.pzjs}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
                 }
 
                 var outboundPlan = db.Queryable<TN_Outbound_Plan>()
                     .Where(p => p.JHDH == model.jhdh).First();
                 if (outboundPlan != null) {
-                    info = $"璁″垝鍗曞彿{model.jhdh}宸插湪鏁版嵁搴撲腑瀛樺湪";
-                    LogHelper.Info(info);
-                    return NewErpResult(1, info);
+                    return NewErpResult(1, preLog + $"璁″垝鍗曞彿'{model.jhdh}'宸插湪[鍑哄簱璁″垝鍗昡涓瓨鍦�");
                 }
 
                 outboundPlan = new TN_Outbound_Plan {
-                    JHDH = model.jhdh, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
-                    CKZT = model.ckzt, // 鍑哄簱鐘舵�锛堥渶瑕佽繑鍥烇級
+                    JHDH = model.jhdh, // 璁″垝鍗曞彿 (鍞竴鏍囪瘑) 
+                    CKZT = model.ckzt, // 鍑哄簱鐘舵� (闇�杩斿洖) 
                     JHLB = model.jhlb, // 璁″垝绫诲埆
                     CKDH = model.ckdh, // 鍙傝�鍗曞彿
                     CPH = model.cph, // 杞︾墝鍙�@@ -1399,9 +933,9 @@
                     CPLB = model.cplb, // 浜у搧绫诲埆
                     CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
                     PP = model.pp, // 鍝佺墝
-                    DJ = model.dj, // 绛夌骇锛堥渶瑕佽繑鍥烇級
+                    DJ = model.dj, // 绛夌骇 (闇�杩斿洖) 
                     GH = model.gh, // 缃愬彿
-                    PH = model.ph, // 鎵瑰彿锛堥渶瑕佽繑鍥烇級
+                    PH = model.ph, // 鎵瑰彿 (闇�杩斿洖) 
                     BZLX = model.bzlx, // 鍖呰绫诲瀷
                     PZDH = model.pzdh, // 娲捐鍗曞彿
                     PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�@@ -1414,15 +948,15 @@
                     PZ_ZFRQ = model.pz_zfrq, // 娲捐浣滃簾鏃ユ湡
                     PZ_BZ = model.pz_bz, // 娲捐澶囨敞
                     CKDBH = model.ckdbh, // 鍑哄簱鍗曠紪鍙�-                    SFJS = model.sfjs, // 瀹炲彂浠舵暟锛堥渶瑕佽繑鍥烇級
-                    SFSL = model.sfsl, // 瀹炲彂鏁伴噺锛堥渶瑕佽繑鍥烇級
-                    SFCS = model.sfcs, // 瀹炲彂杞︽暟锛堥渶瑕佽繑鍥烇級
-                    ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿锛堥渶瑕佽繑鍥烇級
-                    JLDW = model.jldw, // 璁¢噺鍗曚綅锛堥渶瑕佽繑鍥烇級
-                    FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡锛堥渶瑕佽繑鍥烇級
-                    CKDM = model.ckdm, // 浠撳簱浠g爜锛堥渶瑕佽繑鍥烇級
-                    FHR = model.fhr, // 鍙戣揣浜猴紙闇�杩斿洖锛�-                    CZYDM = model.czydm, // 鎿嶄綔鍛橈紙闇�杩斿洖锛�+                    SFJS = model.sfjs, // 瀹炲彂浠舵暟 (闇�杩斿洖) 
+                    SFSL = model.sfsl, // 瀹炲彂鏁伴噺 (闇�杩斿洖) 
+                    SFCS = model.sfcs, // 瀹炲彂杞︽暟 (闇�杩斿洖) 
+                    ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿 (闇�杩斿洖) 
+                    JLDW = model.jldw, // 璁¢噺鍗曚綅 (闇�杩斿洖) 
+                    FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡 (闇�杩斿洖) 
+                    CKDM = model.ckdm, // 浠撳簱浠g爜 (闇�杩斿洖) 
+                    FHR = model.fhr, // 鍙戣揣浜�(闇�杩斿洖) 
+                    CZYDM = model.czydm, // 鎿嶄綔鍛�(闇�杩斿洖) 
                     SHR_USERNAME = model.shr_username, // 瀹℃牳浜�                     SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
                     ZFBJ = model.zfbj, // 浣滃簾鏍囪
@@ -1431,14 +965,14 @@
                     SHDW = model.shdw, // 鏀惰揣鍗曚綅
                     YSDW = model.ysdw, // 杩愯緭鍗曚綅
                     LXR = model.lxr, // 鑱旂郴浜�-                    RY_ZXG = model.ry_zxg, // 瑁呭嵏宸ワ紙闇�杩斿洖锛�-                    RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満锛堥渶瑕佽繑鍥烇級
+                    RY_ZXG = model.ry_zxg, // 瑁呭嵏宸�(闇�杩斿洖) 
+                    RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満 (闇�杩斿洖) 
                     ERPHX_JHDH = model.erphx_jhdh, // erp浜よ揣鍗曞彿
                     ERPHX_WLBM = model.erphx_wlbm, // erp鐗╂枡缂栫爜
                     ERPHX_WLMC = model.erphx_wlmc, // erp鐗╂枡鍚嶇О
                     ERPHX_CJRQ = model.erphx_cjrq, // erp鍒涘缓鏃ユ湡
-                    HW = model.hw, // 璐т綅锛堥渶瑕佽繑鍥烇級
-                    HWZT = model.hwzt // 璐т綅鐘舵�锛堥渶瑕佽繑鍥烇級
+                    HW = model.hw, // 璐т綅 (闇�杩斿洖) 
+                    HWZT = model.hwzt // 璐т綅鐘舵� (闇�杩斿洖) 
                 };
 
                 //var cgDetailList = SelectCgByTotalQty(
@@ -1453,12 +987,9 @@
                 //    return NewErpResult(3, info);
                 //}
 
-                var cgDetail = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_ITEM_CODE == model.cpdm && d.N_ITEM_NUM >= model.pzjs).First();
+                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.cpdm && d.N_ITEM_NUM >= model.pzjs).First();
                 if (cgDetail == null ) {
-                    info = $"娌℃湁鍚堥�鐨勭墿鏂欏彲浠ユ弧瓒筹細鐗╂枡缂栫爜={model.cpdm}锛岀墿鏂欐暟閲�={model.pzjs}";
-                    LogHelper.Info(info);
-                    return NewErpResult(2, info);
+                    return NewErpResult(2, preLog + $"鍦╗璐у搧鏄庣粏琛╙涓病鏈夋壘鍒板悎閫傜殑鐗╂枡!瑕佹眰:鐗╂枡缂栫爜='{model.cpdm}',鐗╂枡鏁伴噺>={model.pzjs}");
                 }
 
                 var order = new TN_Outbound_Order {
@@ -1501,39 +1032,32 @@
                 detailList.Add(detail);
 
                 using (var tran = db.Ado.UseTran()) {
-                    if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+                    if (db.Insertable(order).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
-                        LogHelper.Info(info);
-                        return NewErpResult(500, info);
+                        return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗昡澶辫触!鏁版嵁:{LogObject(order)}");
                     }
 
-                    if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+                    if (db.Insertable(detailList).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
-                        LogHelper.Info(info);
-                        return NewErpResult(500, info);
+                        return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗曟槑缁哴澶辫触!鏁版嵁:{LogObject(detailList)}");
                     }
 
-                    if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
+                    if (db.Insertable(outboundPlan).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "鐢熸垚鍑哄簱鍗曡鍒掕褰曡〃澶辫触";
-                        LogHelper.Info(info);
-                        return NewErpResult(500, info);
+                        return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗曡鍒掕褰曡〃]澶辫触!鏁版嵁:{LogObject(outboundPlan)}");
                     }
 
                     tran.CommitTran();
+                    return NewErpResult(0, preLog + $"鐢熸垚[鍑哄簱鍗昡鎴愬姛!鍑哄簱鍗�{LogObject(order)}\n鍑哄簱鍗曟槑缁�{LogObject(detail)}");
                 }
-
-                info = $"鐢熸垚鍑哄簱鍗曟垚鍔燂細" + JsonConvert.SerializeObject(order) + "\n鍑哄簱鍗曟槑缁嗭細" +JsonConvert.SerializeObject(detail);
-                LogHelper.Info(info);
-                return NewErpResult(0, info);
             }
             catch (Exception ex) {
-                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.InfoEx(ex);
-                return NewErpResult(1, info);
+                return NewErpResult(1, preLog + $"鍙戠敓浜嗗紓甯�{ex.Message}\n\n{ex.StackTrace}\n");
             }
         }
+
+        private static string LogObject(object obj) {
+            return JsonConvert.SerializeObject(obj).Replace("\"", "'");
+        }
     }
 }

--
Gitblit v1.9.1