From 49efcc39ef399f8f3b170f6b06ffc2177643f1b2 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 27 五月 2025 17:27:39 +0800
Subject: [PATCH] 优化空托上线通过物料类型检查容器的功能

---
 api/ApiHelper.cs |  533 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 349 insertions(+), 184 deletions(-)

diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 3c352ae..f844780 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -32,8 +32,8 @@
             try {
                 // 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
                 var cgDetail = db.Queryable<TN_CG_Detail>()
-                    .Where(d => d.S_ITEM_CODE == model.s_item_code && d.S_BATCH_NO == model.s_batch) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙�-                    .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // NOTE 鍐椾綑妫�煡锛氱墿鏂欑姸鎬佸簲璇ヤ负 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 == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
                     .First();
 
                 if (cgDetail == null) {
@@ -42,37 +42,34 @@
                     return NewSimpleResult(1, info);
                 }
 
+                // 璧风偣璐т綅缁戝畾鍚庯紝鍙互涓嶇珛鍗宠缃甆_CURRENT_NUM涓�
+                // 鍥犱负AGV鍙栬揣鍚庡氨浼氭仮澶�锛岃�涓旇揣浣嶄笂閿佸悗涓嶄細琚闂埌
                 var startLoc = db.Queryable<TN_Location>()
-                    .Where(a => a.S_CODE == model.s_start_loc) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+                    .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) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�                     .First();
 
                 if (startLoc == null) {
-                    info = $"璧风偣浣嶇疆 '{model.s_start_loc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+                    info = $"璧风偣浣嶇疆 '{model.StartLoc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
                     LogHelper.Info(info);
                     return NewSimpleResult(3, info);
                 }
 
                 // 缁戝畾璐т綅鍜屽鍣ㄥ彿
                 var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = model.s_start_loc,
+                    S_LOC_CODE = model.StartLoc,
                     S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                     S_CNTR_TYPE = "濂借繍绠�,
                 };
 
-                if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
-                    info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
-                    LogHelper.Info(info);
-                    return NewSimpleResult(4, info);
-                }
-
                 // TODO 婊$鍏ュ簱绠楁硶寰呬紭鍖�                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(a => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.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) // 绛涢�锛氱┖璐т綅
+                    .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.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)
-                    .OrderBy(l => l.S_AREA_CODE).First();
+                    .First();
 
                 if (endLoc == null) {
                     info = "婊$鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
@@ -83,10 +80,17 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
+                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+                        info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+                        tran.RollbackTran();
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
+                    }
+
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                         it.N_LOCK_STATE,
                         it.S_LOCK_STATE,
@@ -94,7 +98,7 @@
                         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);
                     }
@@ -105,29 +109,28 @@
                         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);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
                         LogHelper.Info(info);
                         return NewSimpleResult(4, info);
                     }
 
                     tran.CommitTran();
-                    info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
                     LogHelper.Info(info);
                     return NewSimpleResult(0, info);
                 }
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.Info(info);
+                LogHelper.InfoEx(ex);
                 return NewSimpleResult(1, info);
             }
         }
@@ -242,71 +245,105 @@
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
             try {
+                // 鐜板湪PDA娌℃湁鍗曠嫭鐨勭粦瀹氭祦绋嬶紝缁戝畾鍦ㄥ叆搴撴椂瀹屾垚
                 var startLoc = db.Queryable<TN_Location>()
-                    .Where(a => a.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣�-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(a => a.N_CURRENT_NUM == 1)
+                    .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) // 缁戝畾鍓嶈揣浣嶄负绌�                     .First();
 
                 if (startLoc == null) {
-                    return NewSimpleResult(2, $"璧风偣浣嶇疆 '{model.StartLoc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�);
+                    info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
                 }
 
                 // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�-                var locCntrRel = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
-                    .First();
+                //var locCntrRel = db.Queryable<TN_Loc_Container>()
+                //    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
+                //    .First();
 
-                if (locCntrRel == null) {
-                    return NewSimpleResult(3, $"璧风偣浣嶇疆 '{model.StartLoc}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntrCode}'");
-                }
+                //if (locCntrRel == null) {
+                //    info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
+                //    LogHelper.Info(info);
+                //    return NewSimpleResult(3, info);
+                //}
+
+                // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+                var locCntrRel = new TN_Loc_Container {
+                    S_LOC_CODE = model.StartLoc,
+                    S_CNTR_CODE = model.CntrCode,
+                    S_CNTR_TYPE = "鎵樼洏",
+                };
 
                 // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(a => Settings.AreaMap[AreaName.绌烘墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
-                    .OrderBy(l => l.N_LAYER)
-                    .OrderBy(l => l.S_AREA_CODE).First();
+                    .Where(l => Settings.AreaMap[AreaName.绌烘墭瀛樻斁鍖篯.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, row=SqlFunc.Desc(l.S_AREA_CODE) })
+                    .First();
 
                 if (endLoc == null) {
-                    return NewSimpleResult(4, $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅");
+                    info = $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(4, info);
                 }
 
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 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<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+                        info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
+                    }
+
+                    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) {
+                        tran.RollbackTran();
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, 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) {
-
+                        it.N_LOCK_STATE,
+                        it.S_LOCK_STATE,
+                        it.S_LOCK_OP,
+                        it.T_MODIFY
+                    }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     tran.CommitTran();
-                    return NewSimpleResult(0,
-                        $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(0, info);
                 }
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.Info(info);
+                LogHelper.InfoEx(ex);
                 return NewSimpleResult(1, info);
             }
         }
@@ -321,29 +358,42 @@
             var info = "";
             try {
                 var startLoc = db.Queryable<TN_Location>()
-                    .Where(a => a.S_CODE == model.StartLoc)
-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(a => a.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+                    .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) // 缁戝畾鍓嶈揣浣嶄负绌�                     .First();
 
                 if (startLoc == null) {
-                    return NewSimpleResult(2, $"璧风偣浣嶇疆 '{model.StartLoc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�);
+                    info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
                 }
 
                 // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�-                var locCntrRel = db.Queryable<TN_Loc_Container>()
-                    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
-                    .First();
+                //var locCntrRel = db.Queryable<TN_Loc_Container>()
+                //    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
+                //    .First();
 
-                if (locCntrRel == null) {
-                    return NewSimpleResult(3, $"璧风偣浣嶇疆 '{model.StartLoc}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntrCode}'");
-                }
+                //if (locCntrRel == null) {
+                //    info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
+                //    LogHelper.Info(info);
+                //    return NewSimpleResult(3, info);
+                //}
 
-                // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
+                // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+                var locCntrRel = new TN_Loc_Container {
+                    S_LOC_CODE = model.StartLoc,
+                    S_CNTR_CODE = model.CntrCode,
+                    S_CNTR_TYPE = "濂借繍绠�,
+                };
+
+                // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(a => Settings.AreaMap[AreaName.绌虹瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
-                    .OrderBy(l => l.N_LAYER)
-                    .OrderBy(l => l.S_AREA_CODE).First();
+                    .Where(l => Settings.AreaMap[AreaName.绌虹瀛樻斁鍖篯.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();
 
                 if (endLoc == null) {
                     return NewSimpleResult(4, $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅");
@@ -352,38 +402,58 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 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<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+                        info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
+                    }
+
+                    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) {
+                        tran.RollbackTran();
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, 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) {
-
+                        it.N_LOCK_STATE,
+                        it.S_LOCK_STATE,
+                        it.S_LOCK_OP,
+                        it.T_MODIFY
+                    }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     tran.CommitTran();
-                    return NewSimpleResult(0,
-                        $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(0, info);
                 }
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -398,41 +468,73 @@
             var taskInfo = Settings.TaskMap[taskName];
             var info = "";
             try {
-                // TODO 绗﹀悎鐗╂枡淇℃伅鐨勮揣浣�+                // 鎵剧鍚堢墿鏂欎俊鎭殑璐т綅
+                //var startLoc = db.Queryable<TN_Location>()
+                //    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
+                //    .LeftJoin<TN_Container_Item>((l, c, i) => c.S_CNTR_CODE == i.S_CNTR_CODE) // 鑱旇〃锛氬鍣ㄤ笌鐗╂枡绫诲瀷缁戝畾琛�+                //    .Where(l => taskInfo.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) // 绛涢�锛氭湁璐ц揣浣�+                //    .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
+                //    .Where((l, c, i) => i.S_ITEM_CODE == model.ItemCode) // 纭繚瀹瑰櫒缂栫爜缁戝畾鐨勭墿鏂欑紪鐮佷笌鎵�渶涓�嚧
+                //    .First();
+
+                //if (startLoc == null) {
+                //    info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+                //    LogHelper.Info(info);
+                //    return NewSimpleResult(2, info);
+                //}
+
+                //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
+                //    a => a.S_LOC_CODE == startLoc.S_CODE
+                //    && a.S_CNTR_CODE == model.CntId);
+
+                //if (locCntrRel == null) {
+                //    return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
+                //}
+
+                var cntrItemRel = db.Queryable<TN_Container_Item>()
+                    .Where(i => i.S_CNTR_CODE == model.CntId && i.S_ITEM_CODE == model.ItemCode)
+                    .First();
+
+                if (cntrItemRel == null) {
+                    info = $"瀹瑰櫒{model.CntId}涓嶇鍚堢墿鏂檣model.ItemCode}锛氭病鏈夊湪瀹瑰櫒鐗╂枡绫诲瀷鐧昏琛ㄤ腑鎵惧埌";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
+                }
+
                 var startLoc = db.Queryable<TN_Location>()
-                    .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(a => a.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
+                    .Where(l => taskInfo.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) // 绛涢�锛氭湁璐ц揣浣�+                    .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
                     .First();
 
                 if (startLoc == null) {
-                    return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
-                }
-
-                var locCntrRel = db.Queryable<TN_Loc_Container>().First(
-                    a => a.S_LOC_CODE == startLoc.S_CODE
-                    && a.S_CNTR_CODE == model.CntId);
-
-                if (locCntrRel == null) {
-                    return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
+                    info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(3, info);
                 }
 
                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(a => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(a.S_AREA_CODE))
+                    .Where(l => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(l.S_AREA_CODE))
                     .Where(l => taskInfo.EndAreas.Contains(l.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) // 绛涢�锛氱┖璐т綅
+                    .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) {
-                    return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+                    info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(4, info);
                 }
 
-                var cntId = locCntrRel.S_CNTR_CODE;
+                var cntId = model.CntId;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -442,8 +544,9 @@
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -452,25 +555,29 @@
                         it.S_LOCK_OP,
                         it.T_MODIFY
                     }).ExecuteCommand() <= 0) {
-
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     tran.CommitTran();
-                    return NewSimpleResult(0,
-                        $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(0, info);
                 }
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -485,70 +592,87 @@
             var taskInfo = Settings.TaskMap[taskName];
             var info = "";
             try {
-                // TODO 绗﹀悎鐗╂枡淇℃伅鐨勮揣浣�                 var startLoc = db.Queryable<TN_Location>()
+                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                     .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                    .Where(a => a.N_CURRENT_NUM == 1).First();
+                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+                    .Where(l => l.N_CURRENT_NUM == 1)
+                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
+                    .First();
 
                 if (startLoc == null) {
-                    return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
+                    info = $"鍦ㄧ┖绠卞瓨鏀惧尯涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
                 }
 
-                var locCntrRel = db.Queryable<TN_Loc_Container>().First(
-                    a => a.S_LOC_CODE == startLoc.S_CODE
-                    && a.S_CNTR_CODE == model.CntId);
+                //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
+                //    a => a.S_LOC_CODE == startLoc.S_CODE
+                //    && a.S_CNTR_CODE == model.CntId);
 
-                if (locCntrRel == null) {
-                    return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
-                }
+                //if (locCntrRel == null) {
+                //    return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
+                //}
 
                 var endLoc = db.Queryable<TN_Location>()
-                    .Where(a => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(a.S_AREA_CODE))
+                    .Where(l => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(l.S_AREA_CODE))
                     .Where(l => taskInfo.EndAreas.Contains(l.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)
+                    .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) {
                     return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
                 }
 
-                var cntId = locCntrRel.S_CNTR_CODE;
+                var cntId = model.CntId;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 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) {
+                        it.N_LOCK_STATE,
+                        it.S_LOCK_STATE,
+                        it.S_LOCK_OP,
+                        it.T_MODIFY
+                    }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, 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) {
-
+                        it.N_LOCK_STATE,
+                        it.S_LOCK_STATE,
+                        it.S_LOCK_OP,
+                        it.T_MODIFY
+                    }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(500,
-                            $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                        info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     tran.CommitTran();
-                    return NewSimpleResult(0,
-                        $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+                    info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(0, info);
                 }
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -621,7 +745,9 @@
                 return NewSimpleResult(0, $"鍒涘缓 鎶芥鍗�鎴愬姛");
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
         /// <summary>
@@ -654,7 +780,8 @@
 
                 var startLoc = db.Queryable<TN_Location>()
                     .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+                    .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) {
@@ -666,16 +793,16 @@
                 var endLoc = new TN_Location();
                 if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
                     endLoc = db.Queryable<TN_Location>()
-                        .Where(a => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.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) // 绛涢�锛氱┖璐т綅
+                        .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.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 == "濂借繍绠�) {
                     endLoc = db.Queryable<TN_Location>()
-                        .Where(a => Settings.AreaMap[AreaName.婊$瀛樻斁鍖篯.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)
+                        .Where(l => Settings.AreaMap[AreaName.婊$瀛樻斁鍖篯.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 {
@@ -693,8 +820,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -744,7 +871,7 @@
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.Info(info);
+                LogHelper.InfoEx(ex);
                 return NewSimpleResult(1, info);
             }
         }
@@ -774,7 +901,8 @@
 
                 var startLoc = db.Queryable<TN_Location>()
                     .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
-                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+                    .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) {
@@ -786,7 +914,8 @@
                 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();
+                    .Where(a => a.N_CURRENT_NUM == 0)
+                    .First();
 
                 if (endLoc == null) {
                     return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
@@ -798,8 +927,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -848,7 +977,9 @@
                 }
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -859,6 +990,8 @@
             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 locCntrRel = db.Queryable<TN_Loc_Container>()
@@ -869,9 +1002,30 @@
                     return NewSimpleResult(2, $"璧风偣璐т綅 {model.StartLoc}");
                 }
 
-                var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
-                    .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE)
-                    .First();
+                var endLoc = new TN_Location();
+                if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+                    endLoc = db.Queryable<TN_Location>()
+                        .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.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 =="濂借繍绠�){
+                    endLoc = db.Queryable<TN_Location>()
+                        .Where(l => Settings.AreaMap[AreaName.婊$瀛樻斁鍖篯.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 {
+                    endLoc = null;
+                }
+
+                //var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+                //    .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE)
+                //    .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) {
                     return NewSimpleResult(3, $"涓嶅瓨鍦ㄥ悎閫傜殑缁堢偣璐т綅鍙互鍥炲簱");
@@ -879,8 +1033,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -922,8 +1076,9 @@
                 }
             }
             catch (Exception ex) {
-
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -1047,7 +1202,9 @@
                 return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -1107,7 +1264,9 @@
                 return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -1172,7 +1331,7 @@
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.Info(info);
+                LogHelper.InfoEx(ex);
                 return result;
             }
         }
@@ -1246,7 +1405,9 @@
                 return NewSimpleResult(0, $"鍒涘缓 鎶芥鍗�鎴愬姛");
             }
             catch (Exception ex) {
-                return BuildSimpleEx(ex);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewSimpleResult(1, info);
             }
         }
 
@@ -1266,11 +1427,10 @@
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
-                LogHelper.Info(info);
+                LogHelper.InfoEx(ex);
                 return result;
             }
         }
-
 
         private static string GenerateOrderNo(string snType, string prefix) {
             var id = SYSHelper.GetSerialNumber(snType, prefix);
@@ -1286,12 +1446,13 @@
         public static WmsResult CgInfoSync(CgInfoSyncInfo model) {
             var db = new SqlHelper<object>().GetInstance();
             var random = new Random();
+            var info = "";
 
             try {
                 var detail = new TN_CG_Detail {
                     S_ITEM_CODE = model.ItemCode,
                     S_ITEM_NAME = model.ItemName,
-                    S_CNTR_CODE = Guid.NewGuid().ToString("D"), // NOTE 瀹瑰櫒鍙凤細鐩墠闅忔満锛堝悗鏈熷彲鑳戒細鎸囧畾锛屾垨鑰匬DA缁戝畾鏃跺啀濉叆锛�+                    S_CNTR_CODE = GenerateOrderNo("瀹瑰櫒鍙�, "CN"), // NOTE 瀹瑰櫒鍙凤細鐩墠闅忔満锛堝悗鏈熷彲鑳戒細鎸囧畾锛屾垨鑰匬DA缁戝畾鏃跺啀濉叆锛�                     S_BATCH_NO = model.BatchNo,
                     S_STANDARD = model.Standard,
                     S_NET_WEIGHT = model.NetWeight,
@@ -1299,31 +1460,35 @@
                     //N_PRODUCT_LINE = random.Next(0, 3), // NOTE 浜х嚎鍙凤細鐩墠闅忔満锛堝悗鏈熷彲鑳戒細鎸囧畾锛屾垨鑰匬DA缁戝畾鏃跺啀濉叆锛�                 };
 
-                // 璐т綅瀹瑰櫒缁戝畾鐨勯�杈戯紝鍦ㄥソ杩愮涓嬬嚎PDA鐨勬祦绋嬩腑鎿嶄綔
-
                 //var locCntrRel = new TN_Loc_Container {
                 //    //S_LOC_CODE = Settings.Config.ProductionLines[detail.N_PRODUCT_LINE].OffLoc[0], // 濂借繍绠辩殑浣嶇疆鏄搷浣滃尯锛屼笉鏄骇绾�                 //    S_CNTR_CODE = detail.S_CNTR_CODE,
                 //    S_CNTR_TYPE = "濂借繍绠�, // 璐存爣鏈哄彧閽堝濂借繍绠�                 //};
 
-                //using (var tran = db.Ado.UseTran()) {
-                //    if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0
-                //        && db.Insertable<TN_Loc_Container>(detail).ExecuteCommand() <= 0) {
-                //        tran.RollbackTran();
-                //        return MesResultBuilder(2, "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail));
-                //    }
-                //    tran.CommitTran();
-                //}
+                using (var tran = db.Ado.UseTran()) {
+                    if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
+                        return NewWmsResult(2, info);
+                    }
 
-                if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
-                    return MesResultBuilder(2, "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail));
+                    //if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+                    //    tran.RollbackTran();
+                    //    info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
+                    //    return NewWmsResult(2, info);
+                    //}
+
+                    tran.CommitTran();
                 }
 
-                return MesResultBuilder(0, "鎻掑叆鐗╂枡淇℃伅鎴愬姛");
+                info = "鎻掑叆鐗╂枡淇℃伅鎴愬姛";
+                return NewWmsResult(0, info);
             }
             catch (Exception ex) {
-                return MesResultBuilder(1, ex.Message);
+                info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+                LogHelper.InfoEx(ex);
+                return NewWmsResult(1, info);
             }
         }
     }

--
Gitblit v1.9.1