From 48654bac6d758d6426a0e659a7d7bd08634acfc8 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 12 六月 2025 17:15:49 +0800
Subject: [PATCH] 修复细节错误，优化报错信息

---
 wms/WCSHelper.cs                                                                    |    1 
 api/DebugController.cs                                                              |  161 -----------
 wms/LocationHelper.cs                                                               |    6 
 core/Monitor.cs                                                                     |   73 +++--
 /dev/null                                                                           |    0 
 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/af8508f5-ad22-43b1-b70b-0efaa94c3359.vsidx |    0 
 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43738d2c-dc76-49d4-9704-65742496dac9.vsidx |    0 
 api/ApiHelper.cs                                                                    |  448 ++++++++++++++++-----------------
 util/LogHelper.cs                                                                   |    2 
 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/16cec1d3-204a-4803-a3d3-25bcd983bea9.vsidx |    0 
 api/ApiModel.cs                                                                     |   12 
 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1912c2ce-d2a9-4b1c-82fe-620c78efc36f.vsidx |    0 
 core/WCSCore.cs                                                                     |   40 +--
 13 files changed, 300 insertions(+), 443 deletions(-)

diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/16cec1d3-204a-4803-a3d3-25bcd983bea9.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/16cec1d3-204a-4803-a3d3-25bcd983bea9.vsidx
new file mode 100644
index 0000000..72200f6
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/16cec1d3-204a-4803-a3d3-25bcd983bea9.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1912c2ce-d2a9-4b1c-82fe-620c78efc36f.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1912c2ce-d2a9-4b1c-82fe-620c78efc36f.vsidx
new file mode 100644
index 0000000..0725a14
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1912c2ce-d2a9-4b1c-82fe-620c78efc36f.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx
deleted file mode 100644
index 5622fa1..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43738d2c-dc76-49d4-9704-65742496dac9.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43738d2c-dc76-49d4-9704-65742496dac9.vsidx
new file mode 100644
index 0000000..d2cb725
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43738d2c-dc76-49d4-9704-65742496dac9.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx
deleted file mode 100644
index 58a5f02..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/af8508f5-ad22-43b1-b70b-0efaa94c3359.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/af8508f5-ad22-43b1-b70b-0efaa94c3359.vsidx
new file mode 100644
index 0000000..b7b8a2a
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/af8508f5-ad22-43b1-b70b-0efaa94c3359.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx
deleted file mode 100644
index 9b2648c..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx
deleted file mode 100644
index 7093b03..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx
+++ /dev/null
Binary files differ
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 753f4d6..fabea4d 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -19,7 +19,9 @@
         /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
         /// </summary>
         /// <remarks>
-        /// 娴佺▼锛氫汉宸ュ皢婊＄浠庝骇绾挎惉杩愬埌鎿嶄綔鍖哄悗锛屼娇鐢≒DA璋冪敤鎺ュ彛锛屽懠鍙獳GV灏嗘弧绠辨惉杩愬埌璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
+        /// 浜哄伐锛氫骇绾�=>婊＄鎿嶄綔鍖�br/>
+        /// PDA锛氳皟鐢ㄦ帴鍙ｏ紝鍛煎彨AGV<br/>
+        /// AGV锛氭弧绠辨搷浣滃尯==鎼繍==>璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
         /// </remarks>
         /// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
         /// <returns></returns>
@@ -27,81 +29,70 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�-            var startAreaName = AreaName.M婊＄鎿嶄綔鍖� // 璧风偣璐у尯
-            var endAreaName = AreaName.M婊＄璐ф灦鍖� // 缁堢偣璐у尯
+            const string taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱;
+            const string startAreaName = AreaName.M婊＄鎿嶄綔鍖�
+            const string endAreaName = AreaName.M婊＄璐ф灦鍖�
 
             try {
-                // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
-                if (model.Num <= 0 ) {
-                    info = $"鐗╂枡鏁伴噺{model.Num}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
+                if (model.Num <= 0) {
+                    info = $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬0";
                     LogHelper.Info(info);
                     return NewSimpleResult(400, info);
                 }
 
-                // 璐存爣鏈轰細鎻愬墠灏嗙墿鏂欎俊鎭啓鍏G_Detail琛ㄤ腑
-                // 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
                 var cgDetail = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙�-                    .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
+                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo)
+                    .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
                     .First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹� 
-                // 濡傛灉鎵句笉鍒版寚瀹氱殑鐗╂枡锛岃鏄庝俊鎭笉涓�嚧锛屾姤閿�                 if (cgDetail == null) {
                     info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
                     LogHelper.Info(info);
                     return NewSimpleResult(1, info);
                 }
-                
-                // 鏌ヨ璧风偣璐т綅锛屾槸鍚︾鍚堣姹傦紙鍒濇涓嬬嚎瑕佹眰璐т綅鏃犲鍣級
-                // 娉細璧风偣璐т綅缁戝畾鍓嶆病鏈夎揣鐗╋紝鏁伴噺涓�0
+
                 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 == 0) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�-                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+                    .Where(l => l.S_CODE == model.StartLoc)
+                    .Where(l => Settings.AreaMap[startAreaName].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();
 
                 if (startLoc == null) {
-                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
-                }
+                } 
 
-                startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚庯紝淇敼璧风偣璐т綅鏁伴噺涓�1
+                startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚� 
-                // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛堟弧绠变笅绾垮埌鎿嶄綔鍖猴紝姝ゆ椂灏氭湭缁戝畾锛�                 var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = startLoc.S_CODE, // 宸叉牎楠�-                    S_CNTR_CODE = cgDetail.S_CNTR_CODE, // 宸叉牎楠�+                    S_LOC_CODE = startLoc.S_CODE,
+                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                     S_CNTR_TYPE = "濂借繍绠�,
                 };
-                // NOTE 涓嶉渶瑕佹牎楠宭ocCntrRel鐨勫鍣ㄦ槸鍚﹀瓨鍦紝鍗氬疄涓嬪彂鐗╂枡宸茬粡鍋氳繃鏍￠獙
-                
-                // TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖�+
                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => Settings.AreaMap[endAreaName].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) // 绛涢�锛氱┖璐т綅
+                    .Where(l => Settings.AreaMap[endAreaName].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 => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴�-                    .First();
+                    .First();// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� 
                 if (endLoc == null) {
-                    info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+                    info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
                     LogHelper.Info(info);
                     return NewSimpleResult(3, info);
-                }
+                } 
 
-                var cntId = locCntrRel.S_CNTR_CODE;
+                LocationHelper.LockStartLoc(ref startLoc);
+                LocationHelper.LockEndLoc(ref endLoc);
+                var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�-
-                // 鏁版嵁搴撴搷浣滀簨鍔￠儴鍒嗭細閿欒缂栫爜锛�00
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
-                        info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+                        info = $"鎻掑叆銆愯揣浣嶅鍣ㄧ粦瀹氥�琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
                         LogHelper.Info(info);
                         return NewSimpleResult(500, info);
@@ -131,16 +122,16 @@
                         LogHelper.Info(info);
                         return NewSimpleResult(500, info);
                     }
-                    
+
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
                         return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                     LogHelper.Info(info);
                     return NewSimpleResult(0, info);
                 }
@@ -165,17 +156,17 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
-            var startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
-            var endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+            const string taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
+            const string startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
+            const string endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+            const string cntrType = "鎵樼洏";
 
             try {
-                // 鐜板湪PDA娌℃湁鍗曠嫭鐨勭粦瀹氭祦绋嬶紝缁戝畾鍦ㄥ叆搴撴椂瀹屾垚
                 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 == 0) // 缁戝畾鍓嶈揣浣嶄负绌�-                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+                    .Where(l => l.S_CODE == model.StartLoc)
+                    .Where(l => Settings.AreaMap[startAreaName].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();
 
                 if (startLoc == null) {
@@ -184,20 +175,17 @@
                     return NewSimpleResult(1, info);
                 }
 
-                // TEMP 鐩墠娴佺▼锛氬鍣ㄥ繀椤诲厛鍦ㄧ郴缁熶腑缁存姢锛屽惁鍒欐姤閿�-                // - 鍚庡彴绋嬪簭涓嶅彲浠ョ敓鎴怌ontainer锛屽繀椤荤敱鍓嶅彴缁存姢
-                // - 鍚﹀垯锛屽伐浜洪殢鎰忚緭鍏ヤ竴涓鍣�杈撳叆閿欏鍣ㄥ彿锛岄兘鍙互缁戝畾
                 var cntr = db.Queryable<TN_Container>()
                     .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
                     .First();
 
                 if (cntr == null) {
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
-                if (cntr.S_TYPE != "鎵樼洏") { // 绌烘墭鍏ュ簱
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�鎵樼洏'涓嶅悓锛�;
+                if (cntr.S_TYPE != cntrType) { // 绌烘墭鍏ュ簱
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(3, info);
                 }
@@ -205,11 +193,13 @@
                 // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�                 // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
                 var cgDetailOld = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+                    .Where(d => d.S_CNTR_CODE == model.CntrCode)
+                    .First();
 
                 // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
                 var locCntrRelOld = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
+                    .Where(c => c.S_CNTR_CODE == model.CntrCode)
+                    .First();
 
                 TN_Location locOld = null;
                 if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
@@ -225,33 +215,31 @@
                 var locCntrRel = new TN_Loc_Container {
                     S_LOC_CODE = startLoc.S_CODE,
                     S_CNTR_CODE = cntr.S_CODE,
-                    S_CNTR_TYPE = "鎵樼洏", // 绌烘墭鍏ュ簱
+                    S_CNTR_TYPE = cntrType, // 绌烘墭鍏ュ簱
                 };
 
-                // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+                    .Where(l => Settings.AreaMap[endAreaName].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 })
+                    .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
                     .First();
 
                 if (endLoc == null) {
-                    info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+                    info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻锛氭湭涓婇攣銆佹棤璐х墿";
                     LogHelper.Info(info);
                     return NewSimpleResult(4, info);
                 }
 
-                var cntId = locCntrRel.S_CNTR_CODE;
+                LocationHelper.LockStartLoc(ref startLoc);
+                LocationHelper.LockEndLoc(ref endLoc);
+                var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (cgDetailOld != null) {
                         if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
-                            info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+                            info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
                             return NewSimpleResult(500, info);
@@ -260,7 +248,7 @@
 
                     if (locCntrRelOld != null) {
                         if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
-                            info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯诲け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+                            info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
                             return NewSimpleResult(500, info);
@@ -269,7 +257,7 @@
 
                     if (locOld != null) {
                         if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
-                            info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
+                            info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
                             return NewSimpleResult(500, info);
@@ -277,12 +265,12 @@
                     }
 
                     if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
-                        info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+                        info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
                         LogHelper.Info(info);
                         return NewSimpleResult(500, info);
                     }
-                     
+
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                         it.N_LOCK_STATE,
                         it.S_LOCK_STATE,
@@ -290,7 +278,7 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
                         return NewSimpleResult(500, info);
                     }
@@ -302,28 +290,28 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
                         return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
                         return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                     LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(0, info); 
                 }
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -331,7 +319,7 @@
         /// 濂借繍绠�绌虹鍏ュ簱(PDA)
         /// </summary>
         /// <remarks>
-        /// 浜哄伐灏嗙┖绠遍�杩囨帴椹充綅鍏ュ簱锛岄渶瑕佹柊缁戝畾瀹瑰櫒璐т綅<br/>
+        /// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
         /// 鐢变簬绌虹涓�埇鏄嚭搴撳嵏璐у悗鑾峰緱锛岃�鍑哄簱鏃舵病鏈夋墜鍔ㄥ嵏璐х殑閫昏緫锛屾墍浠ラ渶瑕佸湪鍏ュ簱鐨勬椂鍊欏啀鍒犻櫎鏃х粦瀹氫俊鎭�         /// </remarks>
         /// <returns></returns>
@@ -339,27 +327,25 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
-            var startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
-            var endAreaName = AreaName.K绌虹璐ф灦鍖�
+            const string taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
+            const string startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
+            const string endAreaName = AreaName.K绌虹璐ф灦鍖�
+            const string cntrType = "濂借繍绠�;
 
             try {
                 var startLoc = db.Queryable<TN_Location>()
                     .Where(l => l.S_CODE == model.StartLoc)
+                    .Where(l => Settings.AreaMap[startAreaName].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) // 缁戝畾鍓嶈揣浣嶄负绌�-                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+                    .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓�                     .First();
 
                 if (startLoc == null) {
-                    info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
 
-                // TEMP 鐩墠娴佺▼锛氬鍣ㄥ繀椤诲厛鍦ㄧ郴缁熶腑缁存姢锛屽惁鍒欐姤閿�-                // - 鍚庡彴绋嬪簭涓嶅彲浠ョ敓鎴怌ontainer锛屽繀椤荤敱鍓嶅彴缁存姢
-                // - 鍚﹀垯锛屽伐浜洪殢鎰忚緭鍏ヤ竴涓鍣�杈撳叆閿欏鍣ㄥ彿锛岄兘鍙互缁戝畾
                 var cntr = db.Queryable<TN_Container>()
                     .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
                     .First();
@@ -369,8 +355,8 @@
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
-                if (cntr.S_TYPE != "濂借繍绠�) { // 绌虹鍏ュ簱
-                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�濂借繍绠�涓嶅悓锛�;
+                if (cntr.S_TYPE != cntrType) {
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
@@ -397,15 +383,14 @@
                 var locCntrRel = new TN_Loc_Container {
                     S_LOC_CODE = startLoc.S_CODE,
                     S_CNTR_CODE = cntr.S_CODE,
-                    S_CNTR_TYPE = "濂借繍绠�,
+                    S_CNTR_TYPE = cntrType,
                 };
 
-                // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�                 var endLoc = db.Queryable<TN_Location>()
                     .Where(l => Settings.AreaMap[endAreaName].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 })
+                    .OrderBy(l => new { l.N_LAYER }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�                     .First();
 
                 if (endLoc == null) {
@@ -415,44 +400,45 @@
                 }
 
                 var cntId = locCntrRel.S_CNTR_CODE;
+
+                LocationHelper.LockStartLoc(ref startLoc);
+                LocationHelper.LockEndLoc(ref endLoc);
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�-                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�-
                 using (var tran = db.Ado.UseTran()) {
+                    // 瀛樺湪鏃с�鐗╂枡鏄庣粏銆戣〃鏃讹紝鍒犻櫎鏃ц〃
                     if (cgDetailOld != null) {
                         if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
-                            info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+                            info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
+                            return NewSimpleResult(500, info);
                         }
                     }
-
+                    // 瀛樺湪鏃с�璐т綅瀹瑰櫒缁戝畾銆戣〃鏃讹紝鍒犻櫎鏃ц〃
                     if (locCntrRelOld != null) {
                         if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
-                            info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯诲け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+                            info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
+                            return NewSimpleResult(500, info);
                         }
                     }
 
                     if (locOld != null) {
                         if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
-                            info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
+                            info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
+                            return NewSimpleResult(500, info);
                         }
                     }
 
                     if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
-                        info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+                        info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -462,9 +448,9 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -474,20 +460,20 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                     LogHelper.Info(info);
                     return NewSimpleResult(0, info);
                 }
@@ -495,7 +481,7 @@
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -511,25 +497,23 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
-            var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
-            var endAreaName = AreaName.B鍖呰鍖�
+            const string taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
+            const string startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+            const string endAreaName = AreaName.B鍖呰鍖�
+            const string cntrType = "鎵樼洏";
 
             try {
-                // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�                 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);
                 }
-                // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
-                if (cntr.S_TYPE != "鎵樼洏") { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�鎵樼洏'锛�;
+                if (cntr.S_TYPE != cntrType) { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
+                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
@@ -540,7 +524,7 @@
                     // 寰呭畾锛氬悗闈㈠彲鑳戒細鏇存敼娴佺▼锛屾垨鑰呯敤鍏朵粬淇℃伅锛堝鐗╂枡绫诲瀷/瑙勬牸锛変綔涓哄鍣ㄧ殑瑙勬牸
 
                     needUpdateContainer = true;
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝灏嗙墿鏂欑紪鐮�{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
+                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓�瑙勬牸锛堢墿鏂欑紪鐮侊級涓虹┖锛屽皢鐗╂枡缂栫爜'{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
                     LogHelper.Info(info);
 
                     cntr.S_SPEC = model.ItemCode;
@@ -552,36 +536,36 @@
                 }
 
                 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 => Settings.AreaMap[startAreaName].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) // 绛涢�锛氭湁璐ц揣浣�+                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
+                    .Where(l => Settings.AreaMap[startAreaName].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();
 
                 if (startLoc == null) {
-                    info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+                    info = $"鍦�{startAreaName}'涓紝鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
                     LogHelper.Info(info);
                     return NewSimpleResult(3, info);
                 }
 
                 var endLoc = db.Queryable<TN_Location>()
                     .Where(l => Settings.AreaMap[endAreaName].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) // 绛涢�锛氱┖璐т綅
+                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+                    .Where(l => l.N_CURRENT_NUM == 0)
                     .First();
 
                 if (endLoc == null) {
-                    info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+                    info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
                     LogHelper.Info(info);
                     return NewSimpleResult(4, info);
                 }
 
                 var cntId = model.CntId;
-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
                 LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�                 LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
                 cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�                 cntr.T_MODIFY = DateTime.Now;
@@ -591,9 +575,9 @@
                         if (db.Updateable<TN_Container>(cntr)
                             .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
-                            info = $"鏇存柊琛�{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                            info = $"鏇存柊琛ㄥ鍣ㄨ〃澶辫触锛� + JsonConvert.SerializeObject(cntr);
                             LogHelper.Info(info);
-                            return NewSimpleResult(4, info);
+                            return NewSimpleResult(500, info);
                         }
                     }
 
@@ -604,9 +588,9 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -616,20 +600,20 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                     LogHelper.Info(info);
                     return NewSimpleResult(0, info);
                 }
@@ -650,40 +634,37 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
-            var startAreaName = AreaName.K绌虹璐ф灦鍖�
-            var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
+            const string taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
+            const string startAreaName = AreaName.K绌虹璐ф灦鍖�
+            const string endAreaName = AreaName.K绌虹鎿嶄綔鍖�
+            const string cntrType = "濂借繍绠�;
 
             try {
-                // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�                 var cntr = db.Queryable<TN_Container>()
                     .Where(c => c.S_CODE == model.CntId)
                     .First();
 
-                // 濡傛灉瀹瑰櫒鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛屾姤閿�                 if (cntr == null) {
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(1, info);
                 }
-                // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
-                if (cntr.S_TYPE != "鎵樼洏") { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
-                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�濂借繍绠�锛�;
+                if (cntr.S_TYPE != cntrType) {
+                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷={cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
-                // NOTE 濂借繍绠卞彧闇�鍏虫敞鍦ㄤ笉鍦紝涓嶉渶瑕佸叧蹇冨叾閫傜敤鐗╂枡绫诲瀷
 
                 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, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "濂借繍绠�)
                     .Where(l => Settings.AreaMap[startAreaName].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();
 
                 if (startLoc == null) {
-                    info = $"鍦�{startAreaName}'涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+                    info = $"鍦�{startAreaName}'涓紝鎵句笉鍒板瓨鏀惧鍣ㄧ紪鐮�{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1";
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
@@ -695,7 +676,7 @@
                     .First();
 
                 if (endLoc == null) {
-                    info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+                    info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=0";
                     LogHelper.Info(info);
                     return NewSimpleResult(4, info);
                 }
@@ -714,9 +695,9 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -726,20 +707,20 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                     LogHelper.Info(info);
                     return NewSimpleResult(0, info);
                 }
@@ -747,7 +728,7 @@
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -761,8 +742,9 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
-            var startAreaName = AreaName.C鎶芥鍖�
+            const string taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
+            const string startAreaName = AreaName.C鎶芥鍖�
+            var endAreaName = "";
 
             try {
                 var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -798,17 +780,19 @@
                     return NewSimpleResult(4, info);
                 }
 
-                var endLoc = new TN_Location();
+                TN_Location endLoc = null;
                 if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+                    endAreaName = AreaName.M婊℃墭璐ф灦鍖�
                     endLoc = db.Queryable<TN_Location>()
-                        .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+                        .Where(l => Settings.AreaMap[endAreaName].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 == "濂借繍绠�) {
+                    endAreaName = AreaName.M婊＄璐ф灦鍖�
                     endLoc = db.Queryable<TN_Location>()
-                        .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+                        .Where(l => Settings.AreaMap[endAreaName].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();
@@ -818,13 +802,14 @@
                 }
 
                 if (endLoc == null) {
-                    info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+                    info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0";
                     LogHelper.Info(info);
                     return NewSimpleResult(3, info);
                 }
 
                 cgDetail.N_ITEM_STATE = 0;
                 cgDetail.S_ITEM_STATE = "鍚堟牸";
+                cgDetail.T_MODIFY = DateTime.Now;
 
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
@@ -834,11 +819,11 @@
 
                 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) {
+                        new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
+                        info = $"鐢熸垚'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -848,9 +833,9 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -859,29 +844,29 @@
                         it.S_LOCK_OP,
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
-
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    return NewSimpleResult(0,
-                        $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(0, info);
                 }
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -894,12 +879,14 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+            const string taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+            const string startAreaName = AreaName.C鎶芥鍖�
+            const string endAreaName = AreaName.C鎶芥寮傚父鍖�
 
             try {
 
-                if (!Settings.AreaMap[AreaName.C鎶芥寮傚父鍖篯.Contains(model.EndArea)) {
-                    info = $"缁堢偣搴撳尯{model.EndArea}涓嶅睘浜巤AreaName.C鎶芥寮傚父鍖簘";
+                if (!Settings.AreaMap[endAreaName].Contains(model.EndArea)) {
+                    info = $"杈撳叆鐨勭粓鐐瑰簱鍖�{model.EndArea}'涓嶅睘浜�{endAreaName}'!";
                     LogHelper.Info(info);
                     return NewSimpleResult(1, info);
                 }
@@ -909,8 +896,9 @@
                     .First();
 
                 if (cgDetail == null) {
-
-                    return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡");
+                    info = $"娌℃湁鍦ㄧ墿鏂欐槑缁嗚〃涓紝鎵惧埌鐗╂枡缂栫爜={model.ItemCode}銆佸鍣ㄧ紪鐮�{model.CntrCode}鐨勭墿鏂�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
                 }
 
                 var locCntrRel = db.Queryable<TN_Loc_Container>()
@@ -918,22 +906,22 @@
                     .First();
 
                 if (locCntrRel == null) {
-                    info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
                     LogHelper.Info(info);
                     return NewSimpleResult(3, info);
                 }
 
                 var startLoc = db.Queryable<TN_Location>()
                     .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
+                    .Where(l => Settings.AreaMap[startAreaName].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)
-                    .Where(l => Settings.AreaMap[AreaName.C鎶芥鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
                     .First();
 
                 if (startLoc == null) {
-                    info = "寰呮娊妫�墿鏂欏湪鎶芥鍖轰腑娌℃湁鎵惧埌锛�;
+                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{locCntrRel.S_LOC_CODE}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
                     LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(2, info);
                 }
 
                 var endLoc = db.Queryable<TN_Location>()
@@ -943,7 +931,7 @@
                     .First();
 
                 if (endLoc == null) {
-                    info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+                    info = $"鍦ㄧ粓鐐硅揣鍖�{model.EndArea}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
                     LogHelper.Info(info);
                     return NewSimpleResult(3, info);
                 }
@@ -961,9 +949,9 @@
                     if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
                         new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'涓嶅悎鏍�澶辫触";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -973,9 +961,9 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -984,29 +972,29 @@
                         it.S_LOCK_OP,
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
-
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    return NewSimpleResult(0,
-                        $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(0, info);
                 }
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -1019,7 +1007,8 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.W灏剧鍥炲簱;
+            const string taskName = TaskName.W灏剧鍥炲簱;
+            var endAreaName = "";
             
             try {
                 var startLoc = db.Queryable<TN_Location>()
@@ -1044,25 +1033,23 @@
                     return NewSimpleResult(3, info);
                 }
 
-                //var endLoc = new TN_Location();
                 TN_Location endLoc = null;
                 if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+                    endAreaName = AreaName.M婊℃墭璐ф灦鍖�
                     endLoc = db.Queryable<TN_Location>()
-                        .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+                        .Where(l => Settings.AreaMap[endAreaName].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) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+                        .Where(l => l.N_CURRENT_NUM == 0)
                         .First();
                 }
-                else if (locCntrRel.S_CNTR_TYPE =="濂借繍绠�){
+                else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�){
+                    endAreaName = AreaName.M婊＄璐ф灦鍖�
                     endLoc = db.Queryable<TN_Location>()
-                        .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+                        .Where(l => Settings.AreaMap[endAreaName].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) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+                        .Where(l => l.N_CURRENT_NUM == 0)
                         .First();
                 }
-                //else {
-                //    endLoc = null;
-                //}
 
                 if (endLoc == null) {
                     info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
@@ -1071,10 +1058,10 @@
                 }
 
                 var cntId = locCntrRel.S_CNTR_CODE;
-                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
                 LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�                 LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -1084,9 +1071,9 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -1095,22 +1082,21 @@
                         it.S_LOCK_OP,
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
-
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
-                    info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                     LogHelper.Info(info);
                     return NewSimpleResult(0, info);
                 }
@@ -1118,7 +1104,7 @@
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -1134,7 +1120,7 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+            const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
 
             try {
                 var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1205,7 +1191,7 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+            const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
 
             try {
                 var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1549,14 +1535,14 @@
                         tran.RollbackTran();
                         info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
                         LogHelper.Info(info);
-                        return NewErpResult(2, info);
+                        return NewErpResult(500, info);
                     }
 
                     if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
                         info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
                         LogHelper.Info(info);
-                        return NewErpResult(4, info);
+                        return NewErpResult(500, info);
                     }
 
                     if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
@@ -1569,7 +1555,9 @@
                     tran.CommitTran();
                 }
 
-                return NewErpResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+                info = $"鐢熸垚鍑哄簱鍗曟垚鍔�;
+                LogHelper.Info(info);
+                return NewErpResult(0, info);
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index c995cd7..ea5ebf7 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -260,7 +260,17 @@
         /// <summary>
         /// 涓嶅悎鏍肩Щ搴撴暟鎹被
         /// </summary>
-        public class UnqualifiedShiftInfo : QualifiedBackInfo {
+        public class UnqualifiedShiftInfo {
+            /// <summary>
+            /// 鐗╂枡缂栫爜
+            /// </summary>
+            [JsonProperty("item_code")]
+            public string ItemCode { get; set; }
+            /// <summary>
+            /// 瀹瑰櫒缂栫爜
+            /// </summary>
+            [JsonProperty("cntr_code")]
+            public string CntrCode { get; set; }
             /// <summary>
             /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖猴紙蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖猴級
             /// </summary>
diff --git a/api/DebugController.cs b/api/DebugController.cs
index d377395..b723b09 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -166,64 +166,6 @@
                     //typeof(TN_Container_Item),
                 };
 
-                //var areaNameList = new List<string>();
-                //foreach (var area in Settings.Areas) {
-                //    areaNameList.AddRange(area.Codes);
-                //}
-
-                //var locationList = new List<TN_Location>();
-                //foreach (var area in areaNameList) {
-                //    int i = 0;
-                //    int j = 0;
-                //    int k = 0;
-
-                //    if (area == "KXHJQ" || area == "MTHJQ" || area == "MXHJQ") {
-                //        for (i = 1; i <= 4; i++) {
-                //            for (j = 1; j <= 5; j++) {
-                //                for (k = 1; k <= 3; k++) {
-                //                    locationList.Add(new TN_Location() {
-                //                        N_ROW = i,
-                //                        N_COL = j,
-                //                        N_LAYER = k,
-                //                        S_AREA_CODE = area,
-                //                        S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" +
-                //                        $"-{k.ToString().PadLeft(2, '0')}"
-                //                    });
-                //                }
-                //            }
-                //        }
-                //        continue;
-                //    }
-
-                //    if (area == "BZQ") {
-                //        for (i = 1; i <= 2; i++) {
-                //            for (j = 1; j <= 2; j++) {
-                //                locationList.Add(new TN_Location() {
-                //                    N_ROW = i,
-                //                    N_COL = j,
-                //                    S_AREA_CODE = area,
-                //                    S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
-                //                });
-                //            }
-                //        }
-                //        continue;
-                //    }
-
-                //    i = 1;
-                //    for (j = 1; j <= 5; j++) {
-                //        locationList.Add(new TN_Location() {
-                //            N_ROW = i,
-                //            N_COL = j,
-                //            S_AREA_CODE = area,
-                //            S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
-                //        });
-                //    }
-
-                    
-                //}
-
-
-
                 //using (var tran = db.Ado.UseTran()) {
                 //    //db.CodeFirst.InitTables(entityTypes);
                 //    if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) {
@@ -245,89 +187,6 @@
         }
 
         /// <summary>
-        /// DEBUG锛氭彃鍏ヨ揣浣嶃�瀹瑰櫒銆佽揣鍝佷俊鎭�-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("InsertLocCntrCg")]
-        public string InsertLocCntrCg(LocCntrCg locCntrCg) {
-            var db = new SqlHelper<object>().GetInstance();
-
-            try {
-
-                using (var tran = db.UseTran()) {
-                    LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
-                    if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";
-
-                    var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode);
-                    if (loc == null) {
-                        var newLoc = new TN_Location {
-                            S_CODE = locCntrCg.LocCode,
-                            S_AREA_CODE = locCntrCg.LocArea ?? ""
-                        };
-
-                        if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
-                            tran.RollbackTran();
-                            LogHelper.Info($"鎻掑叆浣嶇疆{locCntrCg.LocCode}澶辫触");
-                            return "鎻掑叆澶辫触";
-                        }
-
-                        loc = newLoc;
-                    }
-
-                    if (string.IsNullOrEmpty(locCntrCg.CntrCode)) {
-                        LogHelper.Info("瀹瑰櫒鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
-                        return "";
-                    }
-
-                    var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode
-                        && a.S_CNTR_CODE == locCntrCg.CntrCode);
-
-                    if (locCntrRel == null) {
-                        var newLocCntrRel = new TN_Loc_Container {
-                            S_LOC_CODE = locCntrCg.LocCode,
-                            S_CNTR_CODE = locCntrCg.CntrCode,
-                            S_CNTR_TYPE = locCntrCg.CntrType ?? ""
-                        };
-
-                        loc.N_CURRENT_NUM = 1;
-
-                        if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0
-                            && db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) {
-                            tran.RollbackTran();
-                            LogHelper.Info($"鎻掑叆浣嶇疆鎵樼洏鍏崇郴{locCntrCg.LocCode}-{locCntrCg.CntrCode}澶辫触");
-                            return "鎻掑叆澶辫触";
-                        }
-                    }
-
-                    if (string.IsNullOrEmpty(locCntrCg.ItemCode)) {
-                        LogHelper.Info("鐗╂枡鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
-                        return "";
-                    }
-
-                    var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode
-                        && a.S_ITEM_CODE == locCntrCg.ItemCode);
-                    if (cgDetail == null) {
-                        var locList = new List<TN_CG_Detail>();
-                        locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" });
-                        if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) {
-                            tran.RollbackTran();
-                            LogHelper.Info($"鎻掑叆鎵樼洏鐗╂枡鍏崇郴{locCntrCg.CntrCode}-{locCntrCg}澶辫触");
-                            return "鎻掑叆澶辫触";
-                        }
-                    }
-                    tran.CommitTran();
-                }
-
-                return "鎻掑叆鏁版嵁鎴愬姛";
-
-            }
-            catch (Exception ex) {
-                return $"Error reading CSV file: {ex.Message}";
-            }
-        }
-
-        /// <summary>
         /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋�         /// </summary>
         /// <param name="model"></param>
@@ -338,11 +197,11 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
-            var startAreaName = AreaName.B鍖呰鍖�
+            const string taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
+            const string startAreaName = AreaName.B鍖呰鍖�
+            const string endAreaName = AreaName.M婊℃墭璐ф灦鍖�
 
             try {
-
                 var itemCode = model.ItemCode;
                 var batchNo = model.BatchNo;
                 var cntrCode = model.CntrCode;
@@ -384,14 +243,14 @@
                 }
 
                 var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
-                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(l => l.N_CURRENT_NUM == 0)
-                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+                    .Where(l => l.S_CODE == startLocCode)
+                    .Where(l => Settings.AreaMap[startAreaName].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();
 
                 if (startLoc == null) {
-                    info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{startLocCode}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
                     LogHelper.Info(info);
                     return info;
                 }
@@ -404,14 +263,14 @@
                 };
 
                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(a.S_AREA_CODE))
+                    .Where(a => Settings.AreaMap[endAreaName].Contains(a.S_AREA_CODE))
                     .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
                     .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
                     .OrderBy(l => l.N_LAYER)
                     .First();
 
                 if (endLoc == null) {
-                    info = "绌烘墭鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+                    info = $"鍦ㄧ粓鐐硅揣鍖�{endAreaName}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
                     LogHelper.Info(info);
                     return info;
                 }
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 8a7dbbd..5c83eba 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -20,10 +20,13 @@
             public string cntr_code { get; set; }
         }
 
-        public static void CheckInbound() {
-            var taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
+        public static void CheckInbound() {                
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
+
+            const string taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
+            const string cntrType = "鎵樼洏";
+
             try {
                 // 鏌ヤ骇绾挎槸鍚︽湁鐗╂枡淇℃伅
                 foreach (var prod in Settings.ProductionLines) {
@@ -80,7 +83,7 @@
 
                         cntr = new TN_Container {
                             S_CODE = cntrCode,
-                            S_TYPE = "鎵樼洏",
+                            S_TYPE = cntrType,
                             S_SPEC = itemCode,
                         };
                     }
@@ -105,14 +108,13 @@
                         info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
                         LogHelper.Info(info);
                         continue;
-                        //return;
                     }
 
                     // 缁戝畾璐т綅鍜屽鍣ㄥ彿
                     var locCntrRel = new TN_Loc_Container {
                         S_LOC_CODE = startLocCode,
                         S_CNTR_CODE = cgDetail.S_CNTR_CODE,
-                        S_CNTR_TYPE = "鎵樼洏",
+                        S_CNTR_TYPE = cntrType,
                     };
 
                     var endLoc = db.Queryable<TN_Location>()
@@ -174,7 +176,8 @@
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
+                            it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂�                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
                             info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
@@ -186,7 +189,7 @@
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
                             info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
@@ -196,13 +199,13 @@
 
                         if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
-                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                             LogHelper.Info(info);
                             continue;
                         }
 
                         tran.CommitTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
                         continue;
                     }
@@ -219,7 +222,7 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+            const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
 
             try {
                 var orderList = db.Queryable<TN_Outbound_Order>()
@@ -323,36 +326,36 @@
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
+                            it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂�                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
-                            info = $"杞锛歿taskName}锛氱敓鎴愪换鍔�{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
                             LogHelper.Info(info);
                             continue;
                         }
-
 
                         if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
-                            info = $"杞锛歿taskName}锛氱敓鎴愪换鍔�{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
                             LogHelper.Info(info);
                             continue;
                         }
 
                         if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
-                            info = $"杞锛歿taskName}锛氱敓鎴愪换鍔�{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                             LogHelper.Info(info);
                             continue;
                         }
 
                         tran.CommitTran();
-                        info = $"杞锛歿taskName}锛氱敓鎴愪换鍔�{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
                         continue;
                     }
@@ -400,7 +403,7 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
-            var taskName = TaskName.C鎶芥_鍑哄簱;
+            const string taskName = TaskName.C鎶芥_鍑哄簱;
 
             try {
                 var orderList = db.Queryable<TN_Spot_Check>()
@@ -481,7 +484,8 @@
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
+                            it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂�                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
                             info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
@@ -493,7 +497,7 @@
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
                             info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
@@ -503,13 +507,13 @@
 
                         if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
-                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                             LogHelper.Info(info);
                             continue;
                         }
 
                         tran.CommitTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
                         continue;
                     }
@@ -520,10 +524,12 @@
             }
         }
 
-        public static void CheckShiftOrder() {
-            var taskName = TaskName.Y绉诲簱;
+        public static void CheckShiftOrder() {                
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
+
+            const string taskName = TaskName.Y绉诲簱;
+
             try {
                 var orderList = db.Queryable<TN_Relocation_List>()
                     .Where(c => c.N_B_STATE == 1)
@@ -541,7 +547,7 @@
                         .Count(d => d.S_OO_NO == order.S_NO && d.N_B_STATE >= 2); // 鎵ц涓�                     var allCount = db.Queryable<TN_RelocationList_Detail>()
                         .Count(d => d.S_OO_NO == order.S_NO);
-                    LogHelper.Info($"杞锛歿taskName}锛氱粺璁taskName}鍗�{order.S_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
+                    LogHelper.Info($"杞锛歿taskName}锛氱粺璁taskName}鍗�{order.S_NO}浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
 
                     if (doingCount == allCount) {
                         order.N_B_STATE = 2; // 鎵�湁浠诲姟閮藉凡鎵ц
@@ -572,7 +578,8 @@
                         .First();
 
                     if (startLoc == null) {
-                        LogHelper.Info($"杞锛歿taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
+                        info = $"杞锛歿taskName}锛氭病鏈夋壘鍒板鍣ㄥ彿={detail.S_CNTR_CODE}鐨勮捣鐐硅揣浣嶏紒闇�婊¤冻锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�1";
+                        LogHelper.Info(info);
                         continue;
                     }
 
@@ -582,7 +589,8 @@
                         .Where(a => a.N_CURRENT_NUM == 0).First();
 
                     if (endLoc == null) {
-                        LogHelper.Info($"杞锛歿taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛�);
+                        info = $"杞锛歿taskName}锛氭病鏈夋壘鍒扮粓鐐硅揣浣�{detail.S_END_AREA}鐨勭粓鐐硅揣浣嶏紒闇�婊¤冻锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
+                        LogHelper.Info(info);
                         continue;
                     }
 
@@ -605,7 +613,8 @@
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
+                            it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂�                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
                             info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
@@ -617,7 +626,7 @@
                             it.N_LOCK_STATE,
                             it.S_LOCK_STATE,
                             it.S_LOCK_OP,
-                            it.T_MODIFY
+                            it.T_MODIFY,
                         }).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
                             info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
@@ -627,13 +636,13 @@
 
                         if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                             tran.RollbackTran();
-                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                            info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                             LogHelper.Info(info);
                             continue;
-                        }
+                        }   
 
                         tran.CommitTran();
-                        info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
                         LogHelper.Info(info);
                         continue;
                     }
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 73363fe..4c9ff87 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -20,27 +20,15 @@
         public static ReturnResult OperateAgvTaskStatus(AgvTaskState model) {
             var result = new ReturnResult();
             try {
-                switch (model.state) {
-                    case 1023:
-                        break;
-                    case 1025:
-                        break;
-                    case 1012:
-                        break;
-                    case 1004:
-                        break;
-                    case 1103:
-                        break;
-                    default:
-                        // AGV 鎵ц浠诲姟鐨勯�杈戝鐞�-                        if (!AgvTaskProcessOk(model)) {
-                            // 鎵ц涓峅K锛岃鏄庢病鏈夋壘鍒颁换鍔�-                            result.ResultCode = 1;
-                            result.ResultMsg = $"鏍规嵁Model.No鏈壘鍒板搴旂殑浠诲姟锛寋model.task_no}";
-                            LogHelper.Info(result.ResultMsg, "API");
-                            return result;
-                        }
-                        break;
+                if (model.state > 0 && model.state < 1000) {
+                    // AGV 鎵ц浠诲姟鐨勯�杈戝鐞�+                    if (!AgvTaskProcessOk(model)) {
+                        // 鎵ц涓峅K锛岃鏄庢病鏈夋壘鍒颁换鍔�+                        result.ResultCode = 1;
+                        result.ResultMsg = $"鏍规嵁Model.No鏈壘鍒板搴旂殑浠诲姟锛寋model.task_no}";
+                        LogHelper.Info(result.ResultMsg, "API");
+                        return result;
+                    }
                 }
 
                 result.ResultCode = 0;
@@ -181,7 +169,6 @@
                 };
 
                 // 鏁版嵁搴撴搷浣�-
                 if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) {
                     info = "鎻掑叆鍑哄叆搴撹褰曡〃澶辫触锛� + JsonConvert.SerializeObject(record);
                     LogHelper.Info(info);
@@ -262,7 +249,6 @@
                     info = $"鍚戣緭閫佺嚎鍐欏叆鍏佽鍙栬揣淇″彿鎴愬姛";
                     LogHelper.Info(info);
                     return NewReturnResult(0, info);
-
                 }
                 else if (model.apply_code == "1") { // 璇锋眰鍗歌揣
                     if (prodLineDevice.AllowAgvPlacePallet != 1) {
@@ -303,7 +289,7 @@
                 .First(d => d.N_B_STATE == 2);
 
             if (detail == null) {
-                LogHelper.Info($"{taskName}--AGV鍙栬揣--鏌ヨ鏄庣粏鍗曪細褰撳墠娌℃湁鎵ц涓殑鏄庣粏鍗�);
+                LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氭煡璇㈡槑缁嗗崟锛氬綋鍓嶆病鏈夋墽琛屼腑鐨勬槑缁嗗崟");
                 return;
             }
 
@@ -311,14 +297,14 @@
                 detail.N_B_STATE = spotStateCode;
                 if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                     tran.RollbackTran();
-                    LogHelper.Info($"{taskName}--AGV鍙栬揣锛氫慨鏀规槑缁嗗崟鐘舵�涓�浠诲姟鎵ц瀹屾垚--澶辫触锛�);
+                    LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氫慨鏀规槑缁嗗崟鐘舵�涓恒�3浠诲姟鎵ц瀹屾垚銆戝け璐ワ紒");
                     return;
                 }
 
                 var finishedCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO && d.N_B_STATE == 3);
                 var allCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO);
 
-                LogHelper.Info($"{taskName}--AGV鍙栬揣--缁熻浠诲姟宸插畬鎴愶細{finishedCount}/{allCount}");
+                LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氱粺璁′换鍔″凡瀹屾垚锛歿finishedCount}/{allCount}");
 
                 if (finishedCount == allCount) { // 褰撳墠鍑哄簱鍗曚笅鐨勬墍鏈夋槑缁嗗崟锛屼换鍔￠兘宸茬粡瀹屾垚
 
@@ -327,7 +313,7 @@
                         .ExecuteCommand() <= 0) {
 
                         tran.RollbackTran();
-                        LogHelper.Info($"{taskName}--AGV鍙栬揣--鎵�湁浠诲姟瀹屾垚鏃讹細淇敼鍗曟嵁鐘舵�涓�浠诲姟鎵ц瀹屾垚--澶辫触锛�);
+                        LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氭墍鏈変换鍔″畬鎴愭椂锛氫慨鏀瑰崟鎹姸鎬佷负3浠诲姟鎵ц瀹屾垚--澶辫触锛�);
                         return;
                     }
                 }
diff --git a/util/LogHelper.cs b/util/LogHelper.cs
index ccf4812..4d2f3d4 100644
--- a/util/LogHelper.cs
+++ b/util/LogHelper.cs
@@ -70,7 +70,7 @@
             }
         }
 
-        #region DIY
+        #region 鑷畾涔夋柟娉�         public static void InfoEx(Exception ex) {
             Info($"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
         }
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index e4bc21a..d746730 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -153,6 +153,12 @@
             return true;
         }
 
+        /// <summary>
+        /// 缁堢偣鍏ュ簱閿侊紙鍙兘瀵规棤閿佽揣浣嶄笂閿侊級
+        /// </summary>
+        /// <param name="loc"></param>
+        /// <param name="lockSource"></param>
+        /// <returns></returns>
         public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") {
             if (loc == null) {
                 LogHelper.Info($"缁堢偣鍏ュ簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null");
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index ee619d8..a4ed288 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -86,7 +86,6 @@
         /// <summary>
         /// 鍒涘缓鎼�浠诲姟
         /// </summary>
-        /// <param name="no">缂栧彿</param>
         /// <param name="from">璧风偣</param>
         /// <param name="to">缁堢偣</param>
         /// <param name="taskType">浠诲姟绫诲瀷</param>

--
Gitblit v1.9.1