From 9fa293298c53429e8ac5148de8328933c0a80ff4 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 11 六月 2025 17:26:04 +0800
Subject: [PATCH] 更新容器必须检查前台是否维护的功能

---
 api/ApiHelper.cs |  473 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 304 insertions(+), 169 deletions(-)

diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 50eb72a..753f4d6 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -32,6 +32,13 @@
             var endAreaName = AreaName.M婊$璐ф灦鍖� // 缁堢偣璐у尯
 
             try {
+                // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
+                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>()
@@ -43,9 +50,9 @@
                 if (cgDetail == null) {
                     info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
                     LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
+                    return NewSimpleResult(1, info);
                 }
-
+                
                 // 鏌ヨ璧风偣璐т綅锛屾槸鍚︾鍚堣姹傦紙鍒濇涓嬬嚎瑕佹眰璐т綅鏃犲鍣級
                 // 娉細璧风偣璐т綅缁戝畾鍓嶆病鏈夎揣鐗╋紝鏁伴噺涓�0
                 var startLoc = db.Queryable<TN_Location>()
@@ -56,35 +63,21 @@
                     .First();
 
                 if (startLoc == null) {
-                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
                     LogHelper.Info(info);
-                    return NewSimpleResult(3, info);
+                    return NewSimpleResult(2, info);
                 }
 
                 startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚庯紝淇敼璧风偣璐т綅鏁伴噺涓�1
 
                 // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛堟弧绠变笅绾垮埌鎿嶄綔鍖猴紝姝ゆ椂灏氭湭缁戝畾锛�                 var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = model.StartLoc,
-                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+                    S_LOC_CODE = startLoc.S_CODE, // 宸叉牎楠�+                    S_CNTR_CODE = cgDetail.S_CNTR_CODE, // 宸叉牎楠�                     S_CNTR_TYPE = "濂借繍绠�,
                 };
-
-                // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
-                // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�-                // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�-                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
-                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
-                var insertContainerItemType = false;
-                if (cntrItemRel == null) {
-                    insertContainerItemType = true;
-                    cntrItemRel = new TN_Container_ItemType {
-                        S_ITEM_CODE = cgDetail.S_ITEM_CODE, // 鐗╂枡绫诲瀷瀵逛簬濂借繍绠辫�瑷�叾瀹炰笉鐢紝涓昏鏄被鍨�-                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
-                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
-                    };
-                }
-
+                // NOTE 涓嶉渶瑕佹牎楠宭ocCntrRel鐨勫鍣ㄦ槸鍚﹀瓨鍦紝鍗氬疄涓嬪彂鐗╂枡宸茬粡鍋氳繃鏍¢獙
+                
                 // TODO 婊$鍏ュ簱绠楁硶寰呬紭鍖�                 var endLoc = db.Queryable<TN_Location>()
                     .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
@@ -96,31 +89,22 @@
                 if (endLoc == null) {
                     info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
                     LogHelper.Info(info);
-                    return NewSimpleResult(4, info);
+                    return NewSimpleResult(3, info);
                 }
 
-                // 鏁版嵁搴撴搷浣滈儴鍒�                 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 (insertContainerItemType) {
-                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
-                            info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
-                            tran.RollbackTran();
-                            LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
-                        }
-                    }
-
                     if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                         info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -133,26 +117,26 @@
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
                         it.N_LOCK_STATE,
                         it.S_LOCK_STATE,
                         it.S_LOCK_OP,
-                        it.T_MODIFY
+                        it.T_MODIFY,
                     }).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
                     
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
@@ -164,7 +148,7 @@
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -175,7 +159,7 @@
         /// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
         /// 鐢变簬绌烘墭鐩樹竴鑸槸鍑哄簱鍗歌揣鍚庤幏寰楋紝鑰屽嚭搴撴椂娌℃湁鎵嬪姩鍗歌揣鐨勯�杈戯紝鎵�互闇�鍦ㄥ叆搴撶殑鏃跺�鍐嶅垹闄ゆ棫缁戝畾淇℃伅
         /// </remarks>
-        /// <param name="model"></param>
+        /// <param name="model">鍖呭惈锛氳捣鐐硅揣浣嶃�瀹瑰櫒鍙枫�瀹瑰櫒绫诲瀷銆佺粓鐐硅揣鍖�/param>
         /// <returns></returns>
         public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
             var db = new SqlHelper<object>().GetInstance();
@@ -195,9 +179,27 @@
                     .First();
 
                 if (startLoc == null) {
-                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囪姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+                    LogHelper.Info(info);
+                    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}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
+                }
+                if (cntr.S_TYPE != "鎵樼洏") { // 绌烘墭鍏ュ簱
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�鎵樼洏'涓嶅悓锛�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(3, info);
                 }
 
                 // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�@@ -209,40 +211,22 @@
                 var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                     .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
 
-                //var locOld = new TN_Location();
                 TN_Location locOld = null;
                 if (locCntrRelOld != null) { // 濡傛灉闇�瑙g粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
                     locOld = db.Queryable<TN_Location>()
                         .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
                     if (locOld != null) {
                         locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
+                        locOld.T_MODIFY = DateTime.Now;
                     }
                 }
-                //else {
-                //    locOld = null;
-                //}
 
                 // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛�                 var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = model.StartLoc,
-                    S_CNTR_CODE = model.CntrCode,
-                    S_CNTR_TYPE = "鎵樼洏",
+                    S_LOC_CODE = startLoc.S_CODE,
+                    S_CNTR_CODE = cntr.S_CODE,
+                    S_CNTR_TYPE = "鎵樼洏", // 绌烘墭鍏ュ簱
                 };
-
-                // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
-                // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�-                // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�-                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
-                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
-                var insertContainerItemType = false;
-                if (cntrItemRel == null) {
-                    insertContainerItemType = true;
-                    cntrItemRel = new TN_Container_ItemType {
-                        S_ITEM_CODE = "", // 绌烘墭鐩樺垰鍏ュ簱锛屾病鏈夌墿鏂欑被鍨嬶紝灏遍粯璁ゅ厛涓虹┖
-                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
-                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
-                    };
-                }
 
                 // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
                 var endLoc = db.Queryable<TN_Location>()
@@ -265,21 +249,12 @@
                 LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
-                    if (insertContainerItemType) {
-                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
-                            info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
-                            tran.RollbackTran();
-                            LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
-                        }
-                    }
-
                     if (cgDetailOld != null) {
                         if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                             info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
+                            return NewSimpleResult(500, info);
                         }
                     }
 
@@ -288,16 +263,16 @@
                             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) {
+                        if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
                             info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
                             tran.RollbackTran();
                             LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
+                            return NewSimpleResult(500, info);
                         }
                     }
 
@@ -305,7 +280,7 @@
                         info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
                      
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -317,7 +292,7 @@
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -329,14 +304,14 @@
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(5, info);
+                        return NewSimpleResult(500, info);
                     }
 
                     tran.CommitTran();
@@ -382,6 +357,24 @@
                     return NewSimpleResult(2, info);
                 }
 
+                // TEMP 鐩墠娴佺▼锛氬鍣ㄥ繀椤诲厛鍦ㄧ郴缁熶腑缁存姢锛屽惁鍒欐姤閿�+                // - 鍚庡彴绋嬪簭涓嶅彲浠ョ敓鎴怌ontainer锛屽繀椤荤敱鍓嶅彴缁存姢
+                // - 鍚﹀垯锛屽伐浜洪殢鎰忚緭鍏ヤ竴涓鍣�杈撳叆閿欏鍣ㄥ彿锛岄兘鍙互缁戝畾
+                var cntr = db.Queryable<TN_Container>()
+                    .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+                    .First();
+
+                if (cntr == null) {
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
+                }
+                if (cntr.S_TYPE != "濂借繍绠�) { // 绌虹鍏ュ簱
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�濂借繍绠�涓嶅悓锛�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
+                }
+
                 // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�                 // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙i櫎
                 var cgDetailOld = db.Queryable<TN_CG_Detail>()
@@ -391,7 +384,6 @@
                 var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                     .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
 
-                //var locOld = new TN_Location();
                 TN_Location locOld = null;
                 if (locCntrRelOld != null) { // 濡傛灉闇�瑙g粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
                     locOld = db.Queryable<TN_Location>()
@@ -400,31 +392,13 @@
                         locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
                     }
                 }
-                //else {
-                //    locOld = null;
-                //}
 
                 // 缁戝畾璐т綅鍜屽鍣ㄥ彿
                 var locCntrRel = new TN_Loc_Container {
-                    S_LOC_CODE = model.StartLoc,
-                    S_CNTR_CODE = model.CntrCode,
+                    S_LOC_CODE = startLoc.S_CODE,
+                    S_CNTR_CODE = cntr.S_CODE,
                     S_CNTR_TYPE = "濂借繍绠�,
                 };
-
-                // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
-                // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�-                // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�-                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
-                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
-                var insertContainerItemType = false;
-                if (cntrItemRel == null) {
-                    insertContainerItemType = true;
-                    cntrItemRel = new TN_Container_ItemType {
-                        S_ITEM_CODE = "", // 绌烘墭鐩樺垰鍏ュ簱锛屾病鏈夌墿鏂欑被鍨嬶紝灏遍粯璁ゅ厛涓虹┖
-                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
-                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
-                    };
-                }
 
                 // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�                 var endLoc = db.Queryable<TN_Location>()
@@ -447,15 +421,6 @@
                 LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
-                    if (insertContainerItemType) {
-                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
-                            info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
-                            tran.RollbackTran();
-                            LogHelper.Info(info);
-                            return NewSimpleResult(5, info);
-                        }
-                    }
-
                     if (cgDetailOld != null) {
                         if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                             info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
@@ -540,7 +505,7 @@
         /// <remarks>
         /// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩�         /// </remarks>
-        /// <param name="model"></param>
+        /// <param name="model">鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
         /// <returns></returns>
         public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
             var db = new SqlHelper<object>().GetInstance();
@@ -551,16 +516,39 @@
             var endAreaName = AreaName.B鍖呰鍖�
 
             try {
-                // 鏌ュ鍣�鐗╂枡绫诲瀷琛�-                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
-                    .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "鎵樼洏")
+                // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+                var cntr = db.Queryable<TN_Container>()
+                    .Where(c => c.S_CODE == model.CntId)
                     .First();
-                // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼笖鐗╂枡绫诲瀷涓庝笂绾挎墍闇�墿鏂欎笉绗︼紝鎶ラ敊
-                // 濡傛灉涓嶅瓨鍦紝涓嶄綔闄愬埗锛堣浣滅涓�涓婄嚎锛�-                if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
-                    info = $"瀹瑰櫒{model.CntId}宸茬粡涓庣墿鏂欑被鍨媨cntrItemRel.S_ITEM_CODE}缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂檣model.ItemCode}";
+
+                // 濡傛灉瀹瑰櫒鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛屾姤閿�+                if (cntr == null) {
+                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(1, info);
+                }
+                // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
+                if (cntr.S_TYPE != "鎵樼洏") { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
+                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�鎵樼洏'锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
+                }
+
+                var needUpdateContainer = false;
+                if (string.IsNullOrEmpty(cntr.S_SPEC)) {
+                    // TEMP 鐩墠娴佺▼锛氬鏋滃鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝鏍规嵁娴佺▼鐨勭墿鏂欎俊鎭啓鍏�+                    // 寰呭畾锛氬悗闈㈠彲鑳戒細鏇存敼娴佺▼锛屾垨鑰呯敤鍏朵粬淇℃伅锛堝鐗╂枡绫诲瀷/瑙勬牸锛変綔涓哄鍣ㄧ殑瑙勬牸
+
+                    needUpdateContainer = true;
+                    info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝灏嗙墿鏂欑紪鐮�{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
+                    LogHelper.Info(info);
+
+                    cntr.S_SPEC = model.ItemCode;
+                }
+                else if (cntr.S_SPEC != model.ItemCode) {
+                    info = $"瀹瑰櫒'{model.CntId}'宸茬粡涓庣墿鏂欑被鍨�{cntr.S_SPEC}'缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂�{model.ItemCode}'";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(3, info);
                 }
 
                 var startLoc = db.Queryable<TN_Location>()
@@ -595,7 +583,20 @@
                 LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�                 LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
+                cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�+                cntr.T_MODIFY = DateTime.Now;
+
                 using (var tran = db.Ado.UseTran()) {
+                    if (needUpdateContainer) {
+                        if (db.Updateable<TN_Container>(cntr)
+                            .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
+                            tran.RollbackTran();
+                            info = $"鏇存柊琛�{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.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,
@@ -636,7 +637,7 @@
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewSimpleResult(1, info);
+                return NewSimpleResult(-1, info);
             }
         }
 
@@ -650,10 +651,29 @@
             var info = "";
 
             var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
-            var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+            var startAreaName = AreaName.K绌虹璐ф灦鍖�
             var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
 
             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}锛屼笉鏄�濂借繍绠�锛�;
+                    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)
@@ -750,12 +770,20 @@
                     .First();
 
                 if (cgDetail == null) {
-                    return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model));
+                    info = "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model);
+                    LogHelper.Info(info);
+                    return NewSimpleResult(2, info);
                 }
 
                 var locCntrRel = db.Queryable<TN_Loc_Container>()
                     .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
                     .First();
+
+                if (locCntrRel == null) {
+                    info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(3, info);
+                }
 
                 var startLoc = db.Queryable<TN_Location>()
                     .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -767,7 +795,7 @@
                 if (startLoc == null) {
                     info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
                     LogHelper.Info(info);
-                    return NewSimpleResult(0, info);
+                    return NewSimpleResult(4, info);
                 }
 
                 var endLoc = new TN_Location();
@@ -786,7 +814,7 @@
                         .First();
                 }
                 else {
-                    return NewSimpleResult(2, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
+                    return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
                 }
 
                 if (endLoc == null) {
@@ -889,11 +917,11 @@
                     .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
                     .First();
 
-                //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 == cgDetail.S_CNTR_CODE) // 鎸囧畾瀹瑰櫒鍙�-                //    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
-                //    .First();
+                if (locCntrRel == null) {
+                    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)
@@ -903,7 +931,7 @@
                     .First();
 
                 if (startLoc == null) {
-                    info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
+                    info = "寰呮娊妫�墿鏂欏湪鎶芥鍖轰腑娌℃湁鎵惧埌锛�;
                     LogHelper.Info(info);
                     return NewSimpleResult(0, info);
                 }
@@ -915,7 +943,9 @@
                     .First();
 
                 if (endLoc == null) {
-                    return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+                    info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+                    LogHelper.Info(info);
+                    return NewSimpleResult(3, info);
                 }
 
                 cgDetail.N_ITEM_STATE = 2;
@@ -1107,9 +1137,9 @@
             var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
 
             try {
-                var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+                var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
 
-                var cgDetailList = SelectCgByTotalQty(model);
+                var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
 
                 if (cgDetailList.Count == 0) {
                     info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1178,9 +1208,9 @@
             var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
 
             try {
-                var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+                var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
 
-                var cgDetailList = SelectCgByTotalQty(model);
+                var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
 
                 if (cgDetailList.Count == 0) {
                     info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1238,14 +1268,14 @@
             }
         }
 
-        public static List<TN_CG_Detail> SelectCgByTotalQty(FinishedOutboundInfo model) {
+        public static List<TN_CG_Detail> SelectCgByTotalQty(int qty, string itemCode, string batchNo, string cntrType = "", bool forcedOut = true) {
             var db = new SqlHelper<object>().GetInstance();
             var result = new List<TN_CG_Detail>();
-            var targetNum = model.Qty;
+            var targetNum = qty;
             var info = "";
             try {
                 var targetCg = db.Queryable<TN_CG_Detail>()
-                    .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
+                    .Where(a => a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo)
                     .Where(a => a.N_ITEM_NUM > targetNum)
                     .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
                 if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠�@@ -1258,10 +1288,18 @@
 
                 var sortedMaterials = new List<TN_CG_Detail>();
 
-                if (model.ForcedOut) {
+                var cntrTypeList = new List<string>();
+                if (cntrType == "") {
+                    cntrTypeList = new List<string> { "鎵樼洏", "濂借繍绠� }; // 涓嶆寚瀹氭墭鐩樼被鍨嬶紝浜岃�鍧囧彲
+                }
+                else {
+                    cntrTypeList.Add(cntrType);
+                }
+
+                if (forcedOut) {
                     sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
-                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
-                    .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+                    .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+                    .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
                     .Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸"
                              || d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
                     .OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
@@ -1269,13 +1307,12 @@
                 }
                 else {
                     sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
-                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
-                    .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+                    .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+                    .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
                     .Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸")
                     .OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
                     .OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
                 }
-
 
                 if (sortedMaterials.Count == 0) //娌℃湁婊¤冻鏉′欢鐨�                 {
@@ -1321,12 +1358,49 @@
             var info = "";
 
             try {
+                if (string.IsNullOrEmpty(model.ItemCode)) {
+                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氱墿鏂欑紪鐮侊紙itemCode锛変笉鑳戒负绌�;
+                    LogHelper.Info(info);
+                    return NewMesResult(400, info);
+                }
+                if (string.IsNullOrEmpty(model.CntrCode)) {
+                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氬鍣ㄧ紪鐮侊紙CntrCode锛変笉鑳戒负绌�;
+                    LogHelper.Info(info);
+                    return NewMesResult(400, info);
+                }
+                if (string.IsNullOrEmpty(model.BatchNo)) {
+                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氭壒娆″彿锛圔atchNo锛変笉鑳戒负绌�;
+                    LogHelper.Info(info);
+                    return NewMesResult(400, info);
+                }
+                if (model.ItemNum <= 0) {
+                    info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氳揣鍝佹暟閲忥紙ItemNum锛夊簲璇ュぇ浜�0";
+                    LogHelper.Info(info);
+                    return NewMesResult(400, info);
+                }
+
+                // TEMP 鐩墠娴佺▼锛氬鍗氬疄涓嬪彂鐨勪俊鎭篃杩涜妫�煡锛屾湭鎵惧埌灏辨姤閿欙紝鍚庨潰鏈夐渶姹傚啀鏇存敼
+                var cntr = db.Queryable<TN_Container>()
+                    .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+                    .First();
+
+                if (cntr == null) {
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+                    LogHelper.Info(info);
+                    return NewMesResult(1, info);
+                }
+                if (cntr.S_TYPE != "濂借繍绠�) {
+                    info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌褰撳墠瀹瑰櫒绫诲瀷'濂借繍绠�涓嶅悓锛�;
+                    LogHelper.Info(info);
+                    return NewMesResult(2, info);
+                }
+
                 // 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑锛堟鏃舵墭鐩樻病鏈変笌浜х嚎澶勭殑璐т綅缁戝畾锛�                 var detail = new TN_CG_Detail {
-                    S_ITEM_CODE = model.ItemCode,
-                    S_ITEM_NAME = model.ItemName,
-                    S_CNTR_CODE = model.CntrCode, // 鏂欑缂栧彿锛堝緟瀹氾紝鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙戯級
-                    S_BATCH_NO = model.BatchNo,
+                    S_ITEM_CODE = model.ItemCode, // NOT NULL
+                    S_ITEM_NAME = model.ItemName, 
+                    S_CNTR_CODE = model.CntrCode, // NOT NULL 鏂欑缂栧彿锛堝緟瀹氾紝鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙戯級
+                    S_BATCH_NO = model.BatchNo,   // NOT NULL
                     S_STANDARD = model.Standard,
                     S_NET_WEIGHT = model.NetWeight,
                     S_QUALITY_GRADE = model.QualityGrade,
@@ -1349,7 +1423,7 @@
                     if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
                         info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
-                        return NewMesResult(2, info);
+                        return NewMesResult(500, info);
                     }
 
                     tran.CommitTran();
@@ -1361,30 +1435,82 @@
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
                 LogHelper.InfoEx(ex);
-                return NewMesResult(1, info);
+                return NewMesResult(-1, info);
             }
         }
 
-        public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
+        public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+            var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
             var info = "";
             try {
-                if (string.IsNullOrEmpty(orderNo)) {
-                    info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+                // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
+                if (model.pzsl <= 0) {
+                    info = $"鐗╂枡鏁伴噺(pzsl){model.pzsl}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
                     LogHelper.Info(info);
-                    return NewErpResult(2, info);
+                    return NewErpResult(400, info);
                 }
 
-                var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo {
-                    BatchNo = model.BatchNo,
-                    CntrType= model.CntrType,
-                    ItemCode= model.ItemCode,
-                    EndArea= model.EndArea,
-                    ForcedOut= model.ForcedOut,
-                    Qty= model.Qty,
-                    Spe = model.Spe
-                });
+                var outboundPlan = new TN_Outbound_Plan {
+                    JHDH = model.jhdh, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
+                    CKZT = model.ckzt, // 鍑哄簱鐘舵�
+                    JHLB = model.jhlb, // 璁″垝绫诲埆
+                    CKDH = model.ckdh, // 鍙傝�鍗曞彿
+                    CPH = model.cph, // 杞︾墝鍙�+                    YSFS = model.ysfs, // 杩愯緭鏂瑰紡
+                    CPZT = model.cpzt, // 浜у搧鐘舵�
+                    MDDW = model.mddw, // 涔版柇鍗曚綅
+                    CPDM = model.cpdm, // 浜у搧浠g爜
+                    CPLB = model.cplb, // 浜у搧绫诲埆
+                    CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
+                    PP = model.pp, // 鍝佺墝
+                    DJ = model.dj, // 绛夌骇
+                    GH = model.gh, // 缃愬彿
+                    PH = model.ph, // 鎵瑰彿
+                    BZLX = model.bzlx, // 鍖呰绫诲瀷
+                    PZDH = model.pzdh, // 娲捐鍗曞彿
+                    PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�+                    PZD_DYBH = model.pzd_dybh, // 娲捐鍗曡皟杩愮紪鍙�+                    PZJS = model.pzjs, // 娲捐浠舵暟
+                    PZSL = model.pzsl, // 娲捐鏁伴噺
+                    PZ_RQ = model.pz_rq, // 娲捐鏃ユ湡(yyyy-mm-dd)
+                    PZ_CZRQ = model.pz_czrq, // 娲捐鎿嶄綔鏃ユ湡
+                    PZ_ZFBJ = model.pz_zfbj, // 娲捐浣滃簾鏍囪
+                    PZ_ZFRQ = model.pz_zfrq, // 娲捐浣滃簾鏃ユ湡
+                    PZ_BZ = model.pz_bz, // 娲捐澶囨敞
+                    CKDBH = model.ckdbh, // 鍑哄簱鍗曠紪鍙�+                    SFJS = model.sfjs, // 瀹炲彂浠舵暟
+                    SFSL = model.sfsl, // 瀹炲彂鏁伴噺
+                    SFCS = model.sfcs, // 瀹炲彂杞︽暟
+                    ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿
+                    JLDW = model.jldw, // 璁¢噺鍗曚綅
+                    FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡
+                    CKDM = model.ckdm, // 浠撳簱浠g爜
+                    FHR = model.fhr, // 鍙戣揣浜�+                    CZYDM = model.czydm, // 鎿嶄綔鍛�+                    SHR_USERNAME = model.shr_username, // 瀹℃牳浜�+                    SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
+                    ZFBJ = model.zfbj, // 浣滃簾鏍囪
+                    ZFRQ = model.zfrq, // 浣滃簾鏃ユ湡
+                    JSDW = model.jsdw, // 缁撶畻鍗曚綅
+                    SHDW = model.shdw, // 鏀惰揣鍗曚綅
+                    YSDW = model.ysdw, // 杩愯緭鍗曚綅
+                    LXR = model.lxr, // 鑱旂郴浜�+                    RY_ZXG = model.ry_zxg, // 瑁呭嵏宸�+                    RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満
+                    ERPHX_JHDH = model.erphx_jhdh, // erp浜よ揣鍗曞彿
+                    ERPHX_WLBM = model.erphx_wlbm, // erp鐗╂枡缂栫爜
+                    ERPHX_WLMC = model.erphx_wlmc, // erp鐗╂枡鍚嶇О
+                    ERPHX_CJRQ = model.erphx_cjrq, // erp鍒涘缓鏃ユ湡
+                    HW = model.hw, // 璐т綅
+                    HWZT = model.hwzt // 璐т綅鐘舵�
+                };
+
+                var cgDetailList = SelectCgByTotalQty(
+                    qty: (int)model.pzsl,
+                    itemCode: model.cpdm,
+                    batchNo: model.ph
+                    );
 
                 if (cgDetailList.Count == 0) {
                     info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1394,12 +1520,12 @@
 
                 var order = new TN_Outbound_Order {
                     S_NO = orderNo,
-                    S_ITEM_CODE = model.ItemCode,
-                    S_BATCH = model.BatchNo,
-                    N_END_NUM = model.Qty,
+                    S_ITEM_CODE = model.cpdm,
+                    S_BATCH = model.ph,
+                    N_END_NUM = (int)model.pzsl,
                     //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
-                    S_END_AREA = model.EndArea,
-                    S_BS_NO = model.ErpNo,
+                    S_END_AREA = model.ysfs == "姹借溅" ? "QCCKQ" : "HCCKQ", // 鏆傛椂鐢ㄨ繍杈撴柟寮忥紙鐏溅/姹借溅锛夋潵鍖哄垎缁堢偣璐у尯
+                    S_BS_NO = model.jhdh,
                     S_BS_TYPE = "ERP",
                 };
 
@@ -1411,7 +1537,9 @@
                         S_BATCH_NO = cgDetail.S_BATCH_NO,
                         S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                         N_COUNT = cgDetail.N_ITEM_NUM,
-                        S_END_AREA = model.EndArea
+                        S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+                        S_BS_NO = order.S_BS_NO,
+                        S_BS_TYPE= order.S_BS_TYPE,
                     };
                     detailList.Add(detail);
                 }
@@ -1431,6 +1559,13 @@
                         return NewErpResult(4, info);
                     }
 
+                    if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        info = "鐢熸垚鍑哄簱鍗曡鍒掕褰曡〃澶辫触";
+                        LogHelper.Info(info);
+                        return NewErpResult(500, info);
+                    }
+
                     tran.CommitTran();
                 }
 

--
Gitblit v1.9.1