From d20ce230b49932d39ee4ce25e39fd78368c3b28a Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 27 六月 2025 17:26:04 +0800 Subject: [PATCH] 优化配置文件和部分日志打印信息 --- wms/InfoBuilder.cs | 10 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d8091da7-1660-402d-a5cf-dce290dff156.vsidx | 0 Program.cs | 2 wms/LocationHelper.cs | 40 +- core/Monitor.cs | 9 /dev/null | 0 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/334f7960-776b-4009-822a-0655d70b3d13.vsidx | 0 config/config.json | 140 +++------ core/WCSCore.cs | 41 +- .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/41345d82-13c1-4c64-a4e0-a6fa1d398c60.vsidx | 0 HH.WCS.Mobox3.DSZSH.csproj | 1 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/582aed91-b4b2-4db8-856f-14042adcf757.vsidx | 0 config/config.comment.json | 151 +++------ util/Settings.cs | 113 ++---- api/AgvController.cs | 2 api/ApiHelper.cs | 361 +++++++++-------------- api/MoboxController.cs | 8 17 files changed, 339 insertions(+), 539 deletions(-) diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1a495659-e37c-434f-8b88-6132140fefe1.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1a495659-e37c-434f-8b88-6132140fefe1.vsidx deleted file mode 100644 index f92647f..0000000 --- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1a495659-e37c-434f-8b88-6132140fefe1.vsidx +++ /dev/null Binary files differ diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1b470183-023c-416d-bb96-68ba4438601c.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1b470183-023c-416d-bb96-68ba4438601c.vsidx deleted file mode 100644 index eab5c5b..0000000 --- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1b470183-023c-416d-bb96-68ba4438601c.vsidx +++ /dev/null Binary files differ diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/334f7960-776b-4009-822a-0655d70b3d13.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/334f7960-776b-4009-822a-0655d70b3d13.vsidx new file mode 100644 index 0000000..e6299ef --- /dev/null +++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/334f7960-776b-4009-822a-0655d70b3d13.vsidx Binary files differ diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/41345d82-13c1-4c64-a4e0-a6fa1d398c60.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/41345d82-13c1-4c64-a4e0-a6fa1d398c60.vsidx new file mode 100644 index 0000000..c0fdf02 --- /dev/null +++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/41345d82-13c1-4c64-a4e0-a6fa1d398c60.vsidx Binary files differ diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/464eaeb0-6a8d-451a-9aba-ddc122b33d68.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/464eaeb0-6a8d-451a-9aba-ddc122b33d68.vsidx deleted file mode 100644 index 8a5532c..0000000 --- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/464eaeb0-6a8d-451a-9aba-ddc122b33d68.vsidx +++ /dev/null Binary files differ diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/582aed91-b4b2-4db8-856f-14042adcf757.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/582aed91-b4b2-4db8-856f-14042adcf757.vsidx new file mode 100644 index 0000000..bd47b09 --- /dev/null +++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/582aed91-b4b2-4db8-856f-14042adcf757.vsidx Binary files differ diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9ac976c0-07a0-401d-88dc-3e2e5fd17dbc.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9ac976c0-07a0-401d-88dc-3e2e5fd17dbc.vsidx deleted file mode 100644 index 0d6effd..0000000 --- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9ac976c0-07a0-401d-88dc-3e2e5fd17dbc.vsidx +++ /dev/null Binary files differ diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d8091da7-1660-402d-a5cf-dce290dff156.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d8091da7-1660-402d-a5cf-dce290dff156.vsidx new file mode 100644 index 0000000..cda934b --- /dev/null +++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d8091da7-1660-402d-a5cf-dce290dff156.vsidx Binary files differ diff --git a/HH.WCS.Mobox3.DSZSH.csproj b/HH.WCS.Mobox3.DSZSH.csproj index 4df2d0e..ee0537c 100644 --- a/HH.WCS.Mobox3.DSZSH.csproj +++ b/HH.WCS.Mobox3.DSZSH.csproj @@ -272,6 +272,7 @@ <Compile Include="dispatch\HostToAGV.cs" /> <Compile Include="util\LogHelper.cs" /> <Compile Include="wms\ContainerHelper.cs" /> + <Compile Include="wms\InfoBuilder.cs" /> <Compile Include="wms\LocationHelper.cs" /> <Compile Include="wms\SYSHelper.cs" /> <Compile Include="Program.cs" /> diff --git a/Program.cs b/Program.cs index c88fd1c..8bb92d5 100644 --- a/Program.cs +++ b/Program.cs @@ -158,7 +158,5 @@ return task; } } - - } } diff --git a/api/AgvController.cs b/api/AgvController.cs index 2de0b6f..77cced6 100644 --- a/api/AgvController.cs +++ b/api/AgvController.cs @@ -45,8 +45,6 @@ return WCSCore.SafetyInteraction(model); } - - // 澶囩敤锛歊equest 璇锋眰鎺堟潈 --------------------------------------------- // 妯℃嫙瀛樺偍鐨凙ppKey鍜孉ppSecret锛堝疄闄呭簲瀛樺偍鍦ㄦ暟鎹簱鎴栭厤缃腑锛�diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs index 2c76ec6..94913f5 100644 --- a/api/ApiHelper.cs +++ b/api/ApiHelper.cs @@ -16,7 +16,7 @@ namespace HH.WCS.Mobox3.DSZSH.api { public class ApiHelper { /// <summary> - /// 濂借繍绠�婊$涓嬬嚎鍏ュ簱(PDA) + /// 婊$涓嬬嚎鍏ュ簱 /// </summary> /// <remarks> /// 浜哄伐锛氫骇绾�=>婊$鎿嶄綔鍖�br/> @@ -29,9 +29,12 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.H濂借繍绠盻婊$涓嬬嚎鍏ュ簱; - const string startAreaName = AreaName.M婊$鎿嶄綔鍖� - const string endAreaName = AreaName.M婊$璐ф灦鍖� + var taskInfo = Settings.GetTaskInfo(ETask.M婊$涓嬬嚎鍏ュ簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + var endAreas = taskInfo.EndAreas; + + var log = $"API锛歿taskName}锛�; try { if (model.Num <= 0) { @@ -40,10 +43,7 @@ return NewSimpleResult(400, info); } - 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 == "寰呮") - .First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�+ var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮").First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹� if (cgDetail == null) { info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model); @@ -51,18 +51,13 @@ return NewSimpleResult(1, info); } - 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) // 缁戝畾鍓�- .First(); + var startLoc = LocationHelper.GetLocQuery(db, 0, startAreas, model.StartLoc).First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; + info = $"锛氭病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛佽姹傦細鏈笂閿併�鏁伴噺=0銆佽揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]"; LogHelper.Info(info); return NewSimpleResult(2, info); - } + } startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚� @@ -72,51 +67,36 @@ S_CNTR_TYPE = "濂借繍绠�, }; - 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 => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴�- .First();// TODO 婊$鍏ュ簱绠楁硶寰呬紭鍖�- + var endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).OrderBy(l => new { l.N_LAYER }).First(); + if (endLoc == null) { - info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; + info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紝闇�婊¤冻锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0"; LogHelper.Info(info); return NewSimpleResult(3, info); - } + } LocationHelper.LockStartLoc(ref startLoc); LocationHelper.LockEndLoc(ref endLoc); + var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙� var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName); 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); } - if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY, - it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂�- }).ExecuteCommand() <= 0) { + if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�; LogHelper.Info(info); return NewSimpleResult(500, info); } - if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY, - }).ExecuteCommand() <= 0) { + if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�; LogHelper.Info(info); @@ -144,7 +124,7 @@ } /// <summary> - /// 鎵樼洏-绌烘墭鍏ュ簱(PDA) + /// 绌烘墭鍏ュ簱 /// </summary> /// <remarks> /// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/> @@ -156,21 +136,22 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱; - const string startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖� - const string endAreaName = AreaName.K绌烘墭瀛樻斁鍖� - const string cntrType = "鎵樼洏"; + var taskInfo = Settings.GetTaskInfo(ETask.K绌烘墭鍏ュ簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + var endAreas = taskInfo.EndAreas; + var 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 => startAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 0) .First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿"; + info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿"; LogHelper.Info(info); return NewSimpleResult(1, info); } @@ -221,14 +202,14 @@ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚� var endLoc = db.Queryable<TN_Location>() - .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) + .Where(l => startAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 0) .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼 .First(); if (endLoc == null) { - info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻锛氭湭涓婇攣銆佹棤璐х墿"; + info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿"; LogHelper.Info(info); return NewSimpleResult(4, info); } @@ -239,59 +220,42 @@ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName); using (var tran = db.Ado.UseTran()) { - if (cgDetailOld != null) { - if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) { - info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld); - tran.RollbackTran(); - LogHelper.Info(info); - return NewSimpleResult(500, info); - } - } - - if (locCntrRelOld != null) { - if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) { - info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld); - tran.RollbackTran(); - LogHelper.Info(info); - return NewSimpleResult(500, info); - } - } - - 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); - tran.RollbackTran(); - LogHelper.Info(info); - return NewSimpleResult(500, info); - } - } - - if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { - info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel); + if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) { tran.RollbackTran(); + info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld); LogHelper.Info(info); return NewSimpleResult(500, 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, - it.N_CURRENT_NUM - }).ExecuteCommand() <= 0) { + if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) { + tran.RollbackTran(); + info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld); + LogHelper.Info(info); + return NewSimpleResult(500, info); + } + + if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) { + tran.RollbackTran(); + info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld); + LogHelper.Info(info); + return NewSimpleResult(500, info); + } + + if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { + tran.RollbackTran(); + info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel); + LogHelper.Info(info); + return NewSimpleResult(500, 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, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�; LogHelper.Info(info); return NewSimpleResult(500, info); } - if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY - }).ExecuteCommand() <= 0) { + if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�; LogHelper.Info(info); @@ -319,7 +283,7 @@ } /// <summary> - /// 濂借繍绠�绌虹鍏ュ簱(PDA) + /// 绌虹鍏ュ簱(濂借繍绠� /// </summary> /// <remarks> /// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/> @@ -330,21 +294,22 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱; - const string startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖� - const string endAreaName = AreaName.K绌虹璐ф灦鍖� + var taskInfo = Settings.GetTaskInfo(ETask.K绌虹鍏ュ簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + var endAreas = taskInfo.EndAreas; 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 => startAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; + info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; LogHelper.Info(info); return NewSimpleResult(2, info); } @@ -392,14 +357,14 @@ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚� var endLoc = db.Queryable<TN_Location>() - .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) + .Where(l => endAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 0) .OrderBy(l => new { l.N_LAYER }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� .First(); if (endLoc == null) { - info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�; + info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿"; LogHelper.Info(info); return NewSimpleResult(4, info); } @@ -412,59 +377,42 @@ using (var tran = db.Ado.UseTran()) { // 瀛樺湪鏃с�鐗╂枡鏄庣粏銆戣〃鏃讹紝鍒犻櫎鏃ц〃 - if (cgDetailOld != null) { - if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) { - info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld); - tran.RollbackTran(); - LogHelper.Info(info); - return NewSimpleResult(500, info); - } + if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) { + tran.RollbackTran(); + info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld); + LogHelper.Info(info); + return NewSimpleResult(500, info); } // 瀛樺湪鏃с�璐т綅瀹瑰櫒缁戝畾銆戣〃鏃讹紝鍒犻櫎鏃ц〃 - if (locCntrRelOld != null) { - if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) { - info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld); - tran.RollbackTran(); - LogHelper.Info(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); - tran.RollbackTran(); - LogHelper.Info(info); - return NewSimpleResult(500, info); - } - } - - if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { - info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel); + if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) { tran.RollbackTran(); + info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld); LogHelper.Info(info); return NewSimpleResult(500, 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, - it.N_CURRENT_NUM - }).ExecuteCommand() <= 0) { + if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) { + tran.RollbackTran(); + info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld); + LogHelper.Info(info); + return NewSimpleResult(500, info); + } + + if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { + tran.RollbackTran(); + info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel); + LogHelper.Info(info); + return NewSimpleResult(500, 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, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�; LogHelper.Info(info); return NewSimpleResult(500, info); } - if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY - }).ExecuteCommand() <= 0) { + if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�; LogHelper.Info(info); @@ -492,7 +440,7 @@ } /// <summary> - /// 鎵樼洏-绌烘墭涓婄嚎(PDA) + /// 绌烘墭涓婄嚎鍑哄簱 /// </summary> /// <remarks> /// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩�@@ -503,9 +451,10 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎; - const string startAreaName = AreaName.K绌烘墭瀛樻斁鍖� - const string endAreaName = AreaName.B鍖呰鍖� + var taskInfo = Settings.GetTaskInfo(ETask.K绌烘墭涓婄嚎鍑哄簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + var endAreas = taskInfo.EndAreas; const string cntrType = "鎵樼洏"; try { @@ -544,25 +493,25 @@ 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 => startAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 1) .First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓紝鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏"; + info = $"鎵句笉鍒伴�鐢ㄤ簬{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 => endAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 0) .First(); if (endLoc == null) { - info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; + info = $"鎵句笉鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; LogHelper.Info(info); return NewSimpleResult(4, info); } @@ -587,24 +536,14 @@ } } - if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY - }).ExecuteCommand() <= 0) { + if (db.Updateable<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(500, info); } - if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY - }).ExecuteCommand() <= 0) { + if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�; LogHelper.Info(info); @@ -632,7 +571,7 @@ } /// <summary> - /// 濂借繍绠�绌虹涓婄嚎(PDA) + /// 绌虹涓婄嚎鍑哄簱 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -640,9 +579,10 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎; - const string startAreaName = AreaName.K绌虹璐ф灦鍖� - const string endAreaName = AreaName.K绌虹鎿嶄綔鍖� + var taskInfo = Settings.GetTaskInfo(ETask.K绌虹涓婄嚎鍑哄簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + var endAreas = taskInfo.EndAreas; const string cntrType = "濂借繍绠�; try { @@ -664,25 +604,25 @@ var startLoc = db.Queryable<TN_Location>() .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "濂借繍绠�) - .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) + .Where(l => startAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 1) .First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓紝鎵句笉鍒板瓨鏀惧鍣ㄧ紪鐮�{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1"; + info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1"; LogHelper.Info(info); return NewSimpleResult(2, info); } var endLoc = db.Queryable<TN_Location>() - .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) + .Where(l => endAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣 .Where(l => l.N_CURRENT_NUM == 0) .First(); if (endLoc == null) { - info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=0"; + info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿"; LogHelper.Info(info); return NewSimpleResult(4, info); } @@ -738,9 +678,8 @@ } } - /// <summary> - /// 鎶芥-鍚堟牸鍥炲簱(PDA) + /// 鎶芥鍚堟牸鍥炲簱 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -748,9 +687,10 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱; - const string startAreaName = AreaName.C鎶芥鍖� - var endAreaName = ""; + var taskInfo = Settings.GetTaskInfo(ETask.C鎶芥鍚堟牸鍥炲簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + var endAreas = taskInfo.EndAreas; try { var cgDetail = db.Queryable<TN_CG_Detail>() @@ -777,38 +717,30 @@ .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣 .Where(l => l.N_CURRENT_NUM == 1) - .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰 + .Where(l => startAreas.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰 .First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿"; + info = $"娌℃湁鎵惧埌瀹瑰櫒{model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿"; LogHelper.Info(info); return NewSimpleResult(4, info); } TN_Location endLoc = null; if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") { - endAreaName = AreaName.M婊℃墭璐ф灦鍖� - 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) // 绛涢�锛氱┖璐т綅 - .First(); + endAreas = taskInfo.EndAreas_Pallet; + endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First(); } else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) { - endAreaName = AreaName.M婊$璐ф灦鍖� - 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) - .First(); + endAreas = taskInfo.EndAreas_Goodpack; + endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First(); } else { return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}"); } if (endLoc == null) { - info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0"; + info = $"娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0"; LogHelper.Info(info); return NewSimpleResult(3, info); } @@ -824,32 +756,21 @@ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� using (var tran = db.Ado.UseTran()) { - if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => - new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) { + if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触"; LogHelper.Info(info); return NewSimpleResult(500, info); } - if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY - }).ExecuteCommand() <= 0) { + if (db.Updateable<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(500, info); } - if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { - it.N_LOCK_STATE, - it.S_LOCK_STATE, - it.S_LOCK_OP, - it.T_MODIFY - }).ExecuteCommand() <= 0) { + if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�; LogHelper.Info(info); @@ -877,7 +798,7 @@ } /// <summary> - /// 鎶芥-涓嶅悎鏍肩Щ搴�PDA) + /// 鎶芥涓嶅悎鏍肩Щ搴� /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -885,14 +806,14 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴� - const string startAreaName = AreaName.C鎶芥鍖� - const string endAreaName = AreaName.C鎶芥寮傚父鍖� + const ETask eTask = ETask.C鎶芥涓嶅悎鏍肩Щ搴� + var taskName = Settings.GetTaskInfo(eTask).TaskName; + var startAreas = Settings.GetTaskInfo(eTask).StartAreas; + var endAreas = Settings.GetTaskInfo(eTask).EndAreas; try { - - if (!Settings.AreaMap[endAreaName].Contains(model.EndArea)) { - info = $"杈撳叆鐨勭粓鐐瑰簱鍖�{model.EndArea}'涓嶅睘浜�{endAreaName}'!"; + if (!startAreas.Contains(model.EndArea)) { + info = $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]"; LogHelper.Info(info); return NewSimpleResult(1, info); } @@ -919,13 +840,13 @@ 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 => startAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣 .Where(l => l.N_CURRENT_NUM == 1) .First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{locCntrRel.S_LOC_CODE}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; + info = $"璧风偣璐т綅' {locCntrRel.S_LOC_CODE} '涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽 {string.Join(", ", startAreas)} ]"; LogHelper.Info(info); return NewSimpleResult(2, info); } @@ -1005,7 +926,7 @@ } /// <summary> - /// 浣欐枡鍥炲簱/灏剧鍥炲簱(PDA) + /// 灏炬枡鍥炲簱/浣欐枡鍥炲簱 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -1013,8 +934,10 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.W灏剧鍥炲簱; - var endAreaName = ""; + var taskInfo = Settings.GetTaskInfo(ETask.W灏炬枡鍥炲簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + List<string> endAreas = null; try { var startLoc = db.Queryable<TN_Location>() @@ -1041,17 +964,17 @@ TN_Location endLoc = null; if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") { - endAreaName = AreaName.M婊℃墭璐ф灦鍖� + endAreas = taskInfo.EndAreas_Pallet; endLoc = db.Queryable<TN_Location>() - .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) + .Where(l => endAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣 .Where(l => l.N_CURRENT_NUM == 0) .First(); } else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�){ - endAreaName = AreaName.M婊$璐ф灦鍖� + endAreas = taskInfo.EndAreas_Goodpack; endLoc = db.Queryable<TN_Location>() - .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) + .Where(l => endAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣 .Where(l => l.N_CURRENT_NUM == 0) .First(); @@ -1126,7 +1049,8 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.C鎴愬搧鑳跺嚭搴� + var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�; + var taskName = taskInfo.TaskName; try { var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD"); @@ -1197,7 +1121,8 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.C鎴愬搧鑳跺嚭搴� + var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�; + var taskName = taskInfo.TaskName; try { var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD"); diff --git a/api/MoboxController.cs b/api/MoboxController.cs index 14d9c86..526ff72 100644 --- a/api/MoboxController.cs +++ b/api/MoboxController.cs @@ -9,26 +9,26 @@ namespace HH.WCS.Mobox3.DSZSH.api { /// <summary> - /// Mobox3 璋冪敤锛岃剼鏈腑璋冪敤锛堝寘鎷�PDA 鐨勬帴鍙o級 + /// Mobox / PDA 鎺ュ彛 /// </summary> [RoutePrefix("api")] public class MoboxController : ApiController { /// <summary> - /// 濂借繍绠�婊$涓嬬嚎鍏ュ簱(PDA) + /// 婊$涓嬬嚎鍏ュ簱 /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("goodpack-offline")] public SimpleResult GoodpackOffline(GoodpackOfflineInfo model) { - var apiName = "濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)"; + var apiName = "婊$涓嬬嚎鍏ュ簱"; LogHelper.InfoApi(apiName, model); return ApiHelper.GoodpackOffline(model); } /// <summary> - /// 绌烘墭/绌虹鍏ュ簱(PDA) + /// 绌烘墭/绌虹鍏ュ簱 /// </summary> /// <param name="model"></param> /// <returns></returns> diff --git a/config/config.comment.json b/config/config.comment.json index 4acea66..2f0c4da 100644 --- a/config/config.comment.json +++ b/config/config.comment.json @@ -1,73 +1,70 @@ { - //"WebApiUrl": "http://192.168.1.141:8901", - //"WebApiUrl": "http://192.168.1.67:8901", - "WebApiUrl": "http://127.0.0.1:8901", - "NdcApiUrl": "http://127.0.0.1:5201/api/order/", - "ErpApiUrl": "http://127.0.0.1:8085/api/", - //"SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;", - "SqlServer": "Data Source=(local);Initial Catalog=DSZSHTest;User ID=sa;Password=123456;", + "WebApiUrl": "http://127.0.0.1:8901", // 鍚庡彴鎺ュ彛璁块棶鍦板潃 + "NdcApiUrl": "http://127.0.0.1:5201/api/order/", // NDC鎺ュ彛鍦板潃 + "ErpApiUrl": "http://127.0.0.1:8901/api/", // ERP鎺ュ彛鍦板潃 + "SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;", // 鏁版嵁搴撻厤缃湴鍧� "TcpServerIp": "127.0.0.1", "TcpServerPort": 8085, - "Areas": [ + "TaskInfo": [ // 浠诲姟璧风偣缁堢偣閰嶇疆锛堜笉鑳芥敼鍙樹换鍔$殑鐩稿浣嶇疆锛� { - "Name": "鍖呰鍖�, - "Codes": [ "BZQ" ] + "TaskName": "濂借繍绠�婊$涓嬬嚎鍏ュ簱", // 浠诲姟鍚嶇О + "StartAreas": [ "MXCZQ" ], // 璧风偣璐у尯锛氭弧绠卞瓨鏀惧尯 + "EndAreas": [ "MXHJQ" ] // 缁堢偣璐у尯锛氭弧绠辫揣鏋跺尯 }, { - "Name": "绌虹鎿嶄綔鍖�, - "Codes": [ "KXCZQ" ] + "TaskName": "濂借繍绠�绌虹涓婄嚎", + "StartAreas": [ "KXHJQ" ], // 绌虹璐ф灦鍖�+ "EndAreas": [ "KXCZQ" ] // 绌虹鎿嶄綔鍖� }, { - "Name": "婊$鎿嶄綔鍖�, - "Codes": [ "MXCZQ" ] + "TaskName": "濂借繍绠�绌虹鍏ュ簱", + "StartAreas": [ "KXJBQ1", "KXJBQ2" ], // 绌虹鍏ュ簱鎺ラ┏鍖�/2 + "EndAreas": [ "KXHJQ" ] // 绌虹璐ф灦鍖� }, { - "Name": "绌烘墭瀛樻斁鍖�, - "Codes": [ "KTCFQ" ] + "TaskName": "鎴愬搧鑳跺嚭搴�, + "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ], + "EndAreas": [ "HCCKQ", "QCCKQ" ] }, { - "Name": "绌虹璐ф灦鍖�, - "Codes": [ "KXHJQ" ] + "TaskName": "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱", + "StartAreas": [], + "EndAreas": [ "MTHJQ" ] }, { - "Name": "婊℃墭璐ф灦鍖�, - "Codes": [ "MTHJQ" ] + "TaskName": "鎵樼洏-绌烘墭涓婄嚎", + "StartAreas": [], + "EndAreas": [] }, { - "Name": "婊$璐ф灦鍖�, - "Codes": [ "MXHJQ" ] + "TaskName": "鎵樼洏-绌烘墭鍏ュ簱", + "StartAreas": [ "KTJBQ" ], // 绌烘墭鎺ラ┏鍖�+ "EndAreas": [ "KTCFQ" ] // 绌烘墭瀛樻斁鍖� }, { - "Name": "鎶芥鍖�, - "Codes": [ "CJQ" ] + "TaskName": "鎶芥-鍑哄簱", + "StartAreas": [ "MTHJQ", "MXHJQ" ], // 婊℃墭璐ф灦鍖恒�婊$璐ф灦鍖�+ "EndAreas": [ "CJQ" ] // 鎶芥鍖� }, { - "Name": "鎶芥寮傚父鍖�, - "Codes": [ "CJYCQ" ] + "TaskName": "鎶芥-鍚堟牸鍥炲簱", + "StartAreas": [ "CJQ" ], // 鎶芥鍖�+ "EndAreas": [] }, { - "Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�, - "Codes": [ "KTJBQ" ] + "TaskName": "鎶芥-涓嶅悎鏍肩Щ搴�, + "StartAreas": [ "CJQ" ], + "EndAreas": [] }, { - "Name": "绌虹鍏ュ簱鎺ラ┏鍖�, - "Codes": [ "KXJBQ1", "KXJBQ2" ] + "TaskName": "绉诲簱", + "StartAreas": [], + "EndAreas": [] }, { - "Name": "姹借溅鍑哄簱鍖�, - "Codes": [ "QCCKQ" ] - }, - { - "Name": "鐏溅鍑哄簱鍖�, - "Codes": [ "HCCKQ" ] - }, - { - "Name": "姹借溅澶囪揣鍖�, - "Codes": [ "QCBHQ" ] - }, - { - "Name": "鐏溅澶囪揣鍖�, - "Codes": [ "HCBHQ" ] + "TaskName": "灏剧鍥炲簱", + "StartAreas": [ "HCCKQ", "QCCKQ" ], // 鐏溅鍑哄簱鍖恒�姹借溅鍑哄簱鍖�+ "EndAreas": [] } ], "ProductionLines": [ @@ -77,12 +74,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 502, "SlaveId": 1, - "OnLoc": [ - "CX11" - ], - "OffLoc": [ - "CX12" - ] + "OnLoc": [ "CX11" ], + "OffLoc": [ "CX12" ] }, { "Id": "2", @@ -90,12 +83,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 503, "SlaveId": 2, - "OnLoc": [ - "CX21" - ], - "OffLoc": [ - "CX22" - ] + "OnLoc": [ "CX21" ], + "OffLoc": [ "CX22" ] }, { "Id": "3", @@ -103,12 +92,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 504, "SlaveId": 3, - "OnLoc": [ - "CX31" - ], - "OffLoc": [ - "CX32" - ] + "OnLoc": [ "CX31" ], + "OffLoc": [ "CX32" ] }, { "Id": "4", @@ -116,46 +101,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 505, "SlaveId": 4, - "OnLoc": [ - "CX41" - ], - "OffLoc": [ - "CX42" - ] - } - ], - "ProdAgvSite": [ - { - "Code": "work111", - "ProdId": 0 - }, - { - "Code": "work112", - "ProdId": 0 - }, - { - "Code": "work121", - "ProdId": 1 - }, - { - "Code": "work122", - "ProdId": 1 - }, - { - "Code": "work131", - "ProdId": 2 - }, - { - "Code": "work132", - "ProdId": 2 - }, - { - "Code": "work141", - "ProdId": 3 - }, - { - "Code": "work142", - "ProdId": 3 + "OnLoc": [ "CX41" ], + "OffLoc": [ "CX42" ] } ] } \ No newline at end of file diff --git a/config/config.json b/config/config.json index 047441b..f3fdc6c 100644 --- a/config/config.json +++ b/config/config.json @@ -5,66 +5,66 @@ "SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;", "TcpServerIp": "127.0.0.1", "TcpServerPort": 8085, - "Areas": [ + "TaskInfos": [ { - "Name": "鍖呰鍖�, - "Codes": [ "BZQ" ] + "TaskName": "婊℃墭涓嬬嚎鍏ュ簱锛堟墭鐩橈級", + "StartAreas": [ "BZQ" ], + "EndAreas": [ "MTHJQ" ] }, { - "Name": "绌虹鎿嶄綔鍖�, - "Codes": [ "KXCZQ" ] + "TaskName": "婊$涓嬬嚎鍏ュ簱锛堝ソ杩愮锛�, + "StartAreas": [ "MXCZQ" ], + "EndAreas": [ "MXHJQ" ] }, { - "Name": "婊$鎿嶄綔鍖�, - "Codes": [ "MXCZQ" ] + "TaskName": "鎴愬搧鑳跺嚭搴�, + "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ], + "EndAreas": [ "HCCKQ", "QCCKQ" ] }, { - "Name": "绌烘墭瀛樻斁鍖�, - "Codes": [ "KTCFQ" ] + "TaskName": "绌烘墭涓婄嚎鍑哄簱", + "StartAreas": [ "KTCFQ" ], + "EndAreas": [ "BZQ" ] }, { - "Name": "绌虹璐ф灦鍖�, - "Codes": [ "KXHJQ" ] + "TaskName": "绌虹涓婄嚎鍑哄簱", + "StartAreas": [ "KXHJQ" ], + "EndAreas": [ "KXCZQ" ] }, { - "Name": "婊℃墭璐ф灦鍖�, - "Codes": [ "MTHJQ" ] + "TaskName": "绌烘墭鍏ュ簱", + "StartAreas": [ "KTJBQ" ], + "EndAreas": [ "KTCFQ" ] }, { - "Name": "婊$璐ф灦鍖�, - "Codes": [ "MXHJQ" ] + "TaskName": "绌虹鍏ュ簱", + "StartAreas": [ "KXJBQ1", "KXJBQ2" ], + "EndAreas": [ "KXHJQ" ] }, { - "Name": "鎶芥鍖�, - "Codes": [ "CJQ" ] + "TaskName": "鎶芥鍑哄簱", + "StartAreas": [ "MTHJQ", "MXHJQ" ], + "EndAreas": [ "CJQ" ] }, { - "Name": "鎶芥寮傚父鍖�, - "Codes": [ "CJYCQ" ] + "TaskName": "鎶芥鍚堟牸鍥炲簱", + "StartAreas": [ "CJQ" ], + "EndAreas_Pallet": [ "MTHJQ" ], + "EndAreas_Goodpack": [ "MXHJQ" ] }, { - "Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�, - "Codes": [ "KTJBQ" ] + "TaskName": "鎶芥涓嶅悎鏍肩Щ搴�, + "StartAreas": [ "CJQ" ], + "EndAreas": [ "CJYCQ" ] }, { - "Name": "绌虹鍏ュ簱鎺ラ┏鍖�, - "Codes": [ "KXJBQ1", "KXJBQ2" ] + "TaskName": "灏炬枡鍥炲簱", + "StartAreas": [ "HCCKQ", "QCCKQ" ], + "EndAreas_Pallet": [ "MTHJQ" ], + "EndAreas_Goodpack": [ "MXHJQ" ] }, { - "Name": "姹借溅鍑哄簱鍖�, - "Codes": [ "QCCKQ" ] - }, - { - "Name": "鐏溅鍑哄簱鍖�, - "Codes": [ "HCCKQ" ] - }, - { - "Name": "姹借溅澶囪揣鍖�, - "Codes": [ "QCBHQ" ] - }, - { - "Name": "鐏溅澶囪揣鍖�, - "Codes": [ "HCBHQ" ] + "TaskName": "绉诲簱" } ], "ProductionLines": [ @@ -74,12 +74,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 502, "SlaveId": 1, - "OnLoc": [ - "CX11" - ], - "OffLoc": [ - "CX12" - ] + "OnLoc": [ "BZQ-1-1" ], + "OffLoc": [ "BZQ12" ] }, { "Id": "2", @@ -87,12 +83,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 503, "SlaveId": 2, - "OnLoc": [ - "CX21" - ], - "OffLoc": [ - "CX22" - ] + "OnLoc": [ "CX21" ], + "OffLoc": [ "CX22" ] }, { "Id": "3", @@ -100,12 +92,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 504, "SlaveId": 3, - "OnLoc": [ - "CX31" - ], - "OffLoc": [ - "CX32" - ] + "OnLoc": [], + "OffLoc": [ "CX32" ] }, { "Id": "4", @@ -113,46 +101,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 505, "SlaveId": 4, - "OnLoc": [ - "CX41" - ], - "OffLoc": [ - "CX42" - ] - } - ], - "ProdAgvSite": [ - { - "Code": "work111", - "ProdId": 0 - }, - { - "Code": "work112", - "ProdId": 0 - }, - { - "Code": "work121", - "ProdId": 1 - }, - { - "Code": "work122", - "ProdId": 1 - }, - { - "Code": "work131", - "ProdId": 2 - }, - { - "Code": "work132", - "ProdId": 2 - }, - { - "Code": "work141", - "ProdId": 3 - }, - { - "Code": "work142", - "ProdId": 3 + "OnLoc": [], + "OffLoc": [ "CX42" ] } ] } \ No newline at end of file diff --git a/core/Monitor.cs b/core/Monitor.cs index 87fc655..dfadc6e 100644 --- a/core/Monitor.cs +++ b/core/Monitor.cs @@ -74,7 +74,8 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.C鎴愬搧鑳跺嚭搴� + var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�; + var taskName = taskInfo.TaskName; try { var orderList = db.Queryable<TN_Outbound_Order>() @@ -235,7 +236,8 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.C鎶芥_鍑哄簱; + var taskInfo = Settings.GetTaskInfo(ETask.C鎶芥鍑哄簱); + var taskName = taskInfo.TaskName; try { var orderList = db.Queryable<TN_Spot_Check>() @@ -360,7 +362,8 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.Y绉诲簱; + var taskInfo = Settings.GetTaskInfo(ETask.Y绉诲簱); + var taskName = taskInfo.TaskName; try { var orderList = db.Queryable<TN_Relocation_List>() diff --git a/core/WCSCore.cs b/core/WCSCore.cs index f0d8b90..72fe0ce 100644 --- a/core/WCSCore.cs +++ b/core/WCSCore.cs @@ -76,7 +76,7 @@ WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚"); // 浠诲姟鐘舵�鏀规垚鍙栬揣瀹屾垚 TaskProcess.OperateStatus(TN_Task, 4); // 璧风偣瀹瑰櫒璐т綅瑙g粦,瑙i攣璧风偣 - if (TN_Task.S_TYPE == TaskName.C鎴愬搧鑳跺嚭搴� { + if (TN_Task.S_TYPE == ETask.C鎴愬搧鑳跺嚭搴�Name()) { var nextOutboundTask = Task.Run(() => { UpdateOutboundTaskState(3); }); @@ -128,8 +128,8 @@ var cgDetail = new TN_CG_Detail(); // 濡傛灉娌℃湁淇℃伅锛岄粯璁ゅ氨鏄┖鍊硷紝鍙互鐩存帴濉叆锛屼笉闇�鍒ゆ柇 //var emptyTask = false; // 绌烘墭/绌虹浠诲姟 - if (task.S_TYPE != TaskName.H濂借繍绠盻绌虹涓婄嚎 && task.S_TYPE != TaskName.H濂借繍绠盻绌虹鍏ュ簱 && - task.S_TYPE != TaskName.T鎵樼洏_绌烘墭涓婄嚎 && task.S_TYPE != TaskName.T鎵樼洏_绌烘墭鍏ュ簱) { + if (task.S_TYPE != ETask.K绌烘墭涓婄嚎鍑哄簱.Name() && task.S_TYPE != ETask.K绌烘墭鍏ュ簱.Name() && + task.S_TYPE != ETask.K绌虹涓婄嚎鍑哄簱.Name() && task.S_TYPE != ETask.K绌虹鍏ュ簱.Name()) { // 闈炵┖鎵�绌虹浠诲姟锛堢┖鎵�绌虹浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅锛� //emptyTask= true; cgDetail = db.Queryable<TN_CG_Detail>() @@ -147,8 +147,8 @@ var isInbound = false; // 鍏ュ簱绫诲瀷鐨勪换鍔★紙鍖呮嫭绉诲簱绫讳换鍔★級 var inboundTasks = new List<string> { - TaskName.H濂借繍绠盻婊$涓嬬嚎鍏ュ簱, TaskName.H濂借繍绠盻绌虹鍏ュ簱, TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱, TaskName.T鎵樼洏_绌烘墭鍏ュ簱, - TaskName.C鎶芥_鍚堟牸鍥炲簱, TaskName.C鎶芥_涓嶅悎鏍肩Щ搴� TaskName.Y绉诲簱 + ETask.M婊℃墭涓嬬嚎鍏ュ簱.Name(), ETask.K绌虹鍏ュ簱.Name(), ETask.M婊℃墭涓嬬嚎鍏ュ簱.Name(), ETask.K绌烘墭鍏ュ簱.Name(), + ETask.C鎶芥鍚堟牸鍥炲簱.Name(), ETask.C鎶芥涓嶅悎鏍肩Щ搴�Name(), ETask.Y绉诲簱.Name() }; if (inboundTasks.Contains(task.S_TYPE)) { isInbound= true; @@ -209,11 +209,17 @@ try { ModbusHelper.Relink(); - //var loc = db.Queryable<TN_Location>() - // .Where(l => l.S_AGV_SITE == model.station_name && Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(l.S_AREA_CODE)) - // .First(); + var BZQ = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱).StartAreas; + var loc = db.Queryable<TN_Location>() + .Where(l => BZQ.Contains(l.S_AREA_CODE) && l.S_AGV_SITE == model.station_name).First(); - if (!Settings.AgvSite_ProdLineCodeMap.TryGetValue(model.station_name, out int prodIndex)) { + if (loc == null) { + info = $"AGV 绔欑偣{model.station_name}涓嶆槸鍚堟硶鐨勪骇绾挎帴椹充綅绔欑偣"; + LogHelper.Info(info); + return NewReturnResult(1, info); + } + + if (!Settings.LocProdIdMap.TryGetValue(loc.S_CODE, out var prodIndex)) { info = $"AGV 绔欑偣{model.station_name}涓嶆槸鍚堟硶鐨勪骇绾挎帴椹充綅绔欑偣"; LogHelper.Info(info); return NewReturnResult(1, info); @@ -296,7 +302,7 @@ } public static void UpdateOutboundTaskState(int spotStateCode) { - var taskName = TaskName.C鎴愬搧鑳跺嚭搴� + var taskName = ETask.C鎴愬搧鑳跺嚭搴�Name(); var db = new SqlHelper<object>().GetInstance(); var detail = db.Queryable<TN_Outbound_Detail>() @@ -524,21 +530,22 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - const string taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱; - const string startAreaName = AreaName.B鍖呰鍖� - const string endAreaName = AreaName.M婊℃墭璐ф灦鍖� + var taskInfo = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱); + var taskName = taskInfo.TaskName; + var startAreas = taskInfo.StartAreas; + var endAreas = taskInfo.EndAreas; const string cntrType = "鎵樼洏"; try { var startLoc = db.Queryable<TN_Location>() .Where(l => l.S_CODE == startLocCode) - .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) + .Where(l => startAreas.Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") //.Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First(); if (startLoc == null) { - info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{startLocCode}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; + info = $"娌℃湁鎵惧埌璧风偣璐т綅'{startLocCode}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; LogHelper.Info(info); return new Result<bool>(false, info); } @@ -556,14 +563,14 @@ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚� var endLoc = db.Queryable<TN_Location>() - .Where(a => Settings.AreaMap[endAreaName].Contains(a.S_AREA_CODE)) + .Where(a => endAreas.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 = $"鍦ㄧ粓鐐硅揣鍖�{endAreaName}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0"; + info = $"娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0"; LogHelper.Info(info); return new Result<bool>(false, info); } diff --git a/util/Settings.cs b/util/Settings.cs index 6e5fc9b..9a653c9 100644 --- a/util/Settings.cs +++ b/util/Settings.cs @@ -16,22 +16,15 @@ public static string SqlServer { get; set; } public static string TcpServerIp { get; set; } public static int TcpServerPort { get; set; } - public static List<Config.Area> Areas { get; set; } = new List<Config.Area>(); public static List<Config.ProductionLine> ProductionLines { get; set; } = new List<Config.ProductionLine>(); - public static List<Config.ProdAgvSite> ProdAgvSites { get; set; } = new List<Config.ProdAgvSite>(); - /// <summary> - /// 搴撳尯瀛楀吀锛堝姞杞藉悗灏变笉鍙橈級 - /// </summary> - public static Dictionary<string, List<string>> AreaMap { get; set; } = new Dictionary<string, List<string>>(); - public static Dictionary<string, int> AgvSite_ProdLineCodeMap { get; set; } = new Dictionary<string, int>(); + public static List<Config.TaskInfo> TaskInfos { get; set; } = new List<Config.TaskInfo> { }; + + public static Dictionary<string, int> LocProdIdMap { get; set; } = new Dictionary<string, int> { }; public static void Init() { // 鍔犺浇閰嶇疆鏂囦欢 LoadJson(); - - // 閽堝 Areas 杩涜杞崲锛氬皢 Config 鐨�List 鍔犺浇鍒�Dict 涓�- LoadAreas(); } private static void LoadJson() { @@ -52,14 +45,17 @@ SqlServer = root.SqlServer; TcpServerIp = root.TcpServerIp; TcpServerPort = root.TcpServerPort; - Areas = root.Areas; ProductionLines = root.ProductionLines; + TaskInfos = root.TaskInfos; - ProdAgvSites = root.ProdAgvSite; - foreach (var item in ProdAgvSites) { - AgvSite_ProdLineCodeMap.Add(item.Code, item.ProdId); + for (var i = 0; i < ProductionLines.Count; i++) { + foreach (var onLoc in ProductionLines[i].OnLoc) { + LocProdIdMap.Add(onLoc, int.Parse(ProductionLines[i].Id)); + } + foreach (var offLoc in ProductionLines[i].OffLoc) { + LocProdIdMap.Add(offLoc, int.Parse(ProductionLines[i].Id)); + } } - } catch (FileNotFoundException) { LogHelper.Info("JSON 鏂囦欢鏈壘鍒�); @@ -73,12 +69,6 @@ LogHelper.Info("鍔犺浇閰嶇疆鏂囦欢淇℃伅 瀹屾垚"); } - private static void LoadAreas() { - foreach (var area in Areas) { - AreaMap.Add(area.Name, area.Codes); - } - } - private static void LoadProdLines() { //var db = new SqlHelper<object>().GetInstance(); //for (int i = 0; i < ProductionLines.Count; i++) { @@ -87,6 +77,9 @@ //} } + public static Config.TaskInfo GetTaskInfo(ETask eTask) { + return TaskInfos[(int)eTask]; + } } // [Convert JSON to C# Classes Online - Json2CSharp Toolkit](https://json2csharp.com/) @@ -94,16 +87,6 @@ public class Config { // Root myDeserializedClass = JsonConvert.DeserializeObject<Root>(myJsonResponse); - public class Area { - public string Name { get; set; } - public List<string> Codes { get; set; } - } - - public class ProdAgvSite { - public string Code { get; set; } - public int ProdId { get; set; } - } - public class ProductionLine { public string Id { get; set; } public string Name { get; set; } @@ -121,53 +104,37 @@ public string SqlServer { get; set; } public string TcpServerIp { get; set; } public int TcpServerPort { get; set; } - public List<Area> Areas { get; set; } - + public List<TaskInfo> TaskInfos { get; set; } public List<ProductionLine> ProductionLines { get; set; } - public List<ProdAgvSite> ProdAgvSite { get; set; } + } + + public class TaskInfo { + public string TaskName { get; set; } + public List<string> StartAreas { get; set; } + public List<string> EndAreas { get; set; } + public List<string> EndAreas_Pallet { get; set; } + public List<string> EndAreas_Goodpack { get; set; } } } - - public class AreaName { - public const string B鍖呰鍖�= "鍖呰鍖�; - public const string K绌虹鎿嶄綔鍖�= "绌虹鎿嶄綔鍖�; - public const string M婊$鎿嶄綔鍖�= "婊$鎿嶄綔鍖�; - - public const string K绌烘墭瀛樻斁鍖�= "绌烘墭瀛樻斁鍖�; - public const string K绌虹璐ф灦鍖�= "绌虹璐ф灦鍖�; - public const string M婊℃墭璐ф灦鍖�= "婊℃墭璐ф灦鍖�; - public const string M婊$璐ф灦鍖�= "婊$璐ф灦鍖�; - - public const string C鎶芥鍖�= "鎶芥鍖�; - public const string C鎶芥寮傚父鍖�= "鎶芥寮傚父鍖�; - - public const string K绌烘墭鍏ュ簱鎺ラ┏鍖�= "绌烘墭鍏ュ簱鎺ラ┏鍖�; - public const string K绌虹鍏ュ簱鎺ラ┏鍖�= "绌虹鍏ュ簱鎺ラ┏鍖�; - - public const string Q姹借溅鍑哄簱鍖�= "姹借溅鍑哄簱鍖�; - public const string H鐏溅鍑哄簱鍖�= "鐏溅鍑哄簱鍖�; - public const string Q姹借溅澶囪揣鍖�= "姹借溅澶囪揣鍖�; - public const string H鐏溅澶囪揣鍖�= "鐏溅澶囪揣鍖�; + public enum ETask { + M婊℃墭涓嬬嚎鍏ュ簱, + M婊$涓嬬嚎鍏ュ簱, + C鎴愬搧鑳跺嚭搴� + K绌烘墭涓婄嚎鍑哄簱, + K绌虹涓婄嚎鍑哄簱, + K绌烘墭鍏ュ簱, + K绌虹鍏ュ簱, + C鎶芥鍑哄簱, + C鎶芥鍚堟牸鍥炲簱, + C鎶芥涓嶅悎鏍肩Щ搴� + W灏炬枡鍥炲簱, + Y绉诲簱, } - public class TaskName { - public const string H濂借繍绠盻婊$涓嬬嚎鍏ュ簱 = "濂借繍绠�婊$涓嬬嚎鍏ュ簱"; - public const string H濂借繍绠盻绌虹涓婄嚎 = "濂借繍绠�绌虹涓婄嚎"; - public const string H濂借繍绠盻绌虹鍏ュ簱 = "濂借繍绠�绌虹鍏ュ簱"; - - public const string C鎴愬搧鑳跺嚭搴�= "鎴愬搧鑳跺嚭搴�; - - public const string T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱 = "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱"; - public const string T鎵樼洏_绌烘墭涓婄嚎 = "鎵樼洏-绌烘墭涓婄嚎"; - public const string T鎵樼洏_绌烘墭鍏ュ簱 = "鎵樼洏-绌烘墭鍏ュ簱"; - - public const string C鎶芥_涓嶅悎鏍肩Щ搴�= "鎶芥-涓嶅悎鏍肩Щ搴�; - public const string C鎶芥_鍑哄簱 = "鎶芥-鍑哄簱"; - public const string C鎶芥_鍚堟牸鍥炲簱 = "鎶芥-鍚堟牸鍥炲簱"; - - public const string Y绉诲簱 = "绉诲簱"; - public const string W灏剧鍥炲簱 = "灏剧鍥炲簱"; + public static class ETaskExtensions { + public static string Name(this ETask eTask) { + return Settings.TaskInfos[(int)eTask].TaskName; + } } - } diff --git a/wms/InfoBuilder.cs b/wms/InfoBuilder.cs new file mode 100644 index 0000000..e5ef789 --- /dev/null +++ b/wms/InfoBuilder.cs @@ -0,0 +1,10 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HH.WCS.Mobox3.DSZSH.wms { + internal class InfoBuilder { + } +} diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs index d746730..114534d 100644 --- a/wms/LocationHelper.cs +++ b/wms/LocationHelper.cs @@ -181,32 +181,26 @@ } /// <summary> - /// 鍏ュ簱閿佸畾缁堢偣锛屽嚭搴撻攣瀹氳捣鐐�+ /// /// </summary> - /// <remarks> - /// 鍒涘缓浠诲姟閿佸畾璐т綅鐨勬椂鍊欙紝鎶婇攣鐨勬潵婧愬氨鏄换鍔″彿涔熷啓涓婂幓锛堝姞閿佺殑鏂规硶鍔犱釜鍙傛暟锛屽彲绌虹殑鍙傛暟锛夛紝瑙i攣鐨勬椂鍊欐妸鏉ユ簮缃┖ - /// </remarks> - /// <param name="loc"></param> - /// <param name="lockState">1:鍏ュ簱閿併�2:鍑哄簱閿併�3:鍏跺畠閿�/param> - /// <param name="lockSource">閿佺殑鏉ユ簮=浠诲姟鍙�/param> + /// <param name="db"></param> + /// <param name="nCurrentNum"></param> + /// <param name="areas"></param> + /// <param name="name"></param> /// <returns></returns> - private static bool LockLoc(string loc, int lockState, string lockSource = "") - { - var res = false; - var db = new SqlHelper<object>().GetInstance(); - var model = db.Queryable<TN_Location>().Where(a => a.S_CODE == loc).First(); - LogHelper.Info($"閿佽揣浣峽loc},鐘舵�{lockState},淇℃伅" + JsonConvert.SerializeObject(model)); - if (model != null && model.N_LOCK_STATE == 0) - { - model.N_LOCK_STATE = lockState; - model.S_LOCK_STATE = TN_Location.GetLockStateStr(lockState); - model.S_LOCK_OP = lockSource; - model.T_MODIFY = System.DateTime.Now; - res = db.Updateable<TN_Location>(model).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() > 0; - } - LogHelper.Info($"閿佽揣浣峽loc}杩斿洖{res}"); + public static ISugarQueryable<TN_Location> GetLocQuery(SqlSugarClient db, int nCurrentNum = 0, List<string> areas = null, string name = null) { + var query = db.Queryable<TN_Location>() + .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == nCurrentNum); - return res; + if (areas != null && !areas.Any()) { + query = query.Where(l => areas.Contains(l.S_AREA_CODE)); + } + + if (!string.IsNullOrEmpty(name)) { + query = query.Where(l => l.S_CODE == name); + } + + return query; } /// <summary> -- Gitblit v1.9.1