From e0d89637030791ce1e7dd46ca5fdec9979977960 Mon Sep 17 00:00:00 2001 From: 杨前锦 <1010338399@qq.com> Date: 星期三, 11 六月 2025 17:28:41 +0800 Subject: [PATCH] 印尼佳通-硫化流程出入库流程开发 --- HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs index 8712fcb..1758ea2 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs @@ -37,7 +37,6 @@ var wmsTask = WMSHelper.GetWmsTask(TN_Task.S_OP_CODE); if (wmsTask != null && wmsTask.N_B_STATE < 2) { - WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData); if (model.State <= 7) { //鏈変换鍔″彿璇锋眰 @@ -152,7 +151,7 @@ if (agvJBLoc != null && agvJBLoc.action == 1) { //鏄垯鏌ヨWCS鐨勪换鍔℃墽琛屾儏鍐�- var wcsTask = WCSHelper.GetTaskBySrcNoAndScheduleType(TN_Task.S_OP_CODE, "WCS"); + var wcsTask = WCSHelper.GetTaskBySrcNoAndScheduleType(TN_Task.S_OP_CODE, "WCS" , wmsTask.S_TYPE); if (wcsTask != null) { bool existAction = WCSHelper.CheckActionRecordExist(wcsTask.S_CODE, 7); @@ -214,6 +213,8 @@ //瀹夊叏璇锋眰绛� TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData); } + + WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData); } } } @@ -371,7 +372,6 @@ return agvLoc; } } - LogHelper.Info($"浠诲姟鍙凤細{taskNo},鍏ュ簱鎺ラ┏浣嶈揣浣嶉兘宸茬鐢�, "AGV"); } else @@ -409,6 +409,46 @@ WMSHelper.updateEmptyTrayBuffer(emptyTray); } } + else + { + var endLoc = WMSHelper.GetInstockEndLoc(container.N_TYPE, null, 1); + if (endLoc != null) + { + Location agvLoc = null; + var locCodes = Settings.getAgvJBLocList(endLoc.N_ROADWAY, 1); + if (locCodes.Count > 0) + { + foreach (var locCode in locCodes) + { + agvLoc = LocationHelper.GetLoc(locCode); + if (agvLoc != null && agvLoc.C_ENABLE == "Y") + { + cst.S_END_LOC = agvLoc.S_CODE; + cst.S_END_AREA = agvLoc.S_AREA_CODE; + WCSHelper.UpdateTaskEnd(cst); + + mst.S_END_LOC = endLoc.S_CODE; + mst.S_END_AREA = endLoc.S_AREA_CODE; + WMSHelper.UpdateTaskEnd(mst); + LocationHelper.LockLoc(endLoc.S_CODE, 1); + + LogHelper.Info($"浠诲姟鍙凤細{taskNo},AGV鐢宠鐨勭粓鐐癸細{agvLoc.S_CODE}", "AGV"); + return agvLoc; + } + } + + LogHelper.Info($"浠诲姟鍙凤細{taskNo},鍏ュ簱鎺ラ┏浣嶈揣浣嶉兘宸茬鐢�, "AGV"); + } + else + { + LogHelper.Info($"浠诲姟鍙凤細{taskNo},娌℃湁閰嶇疆绔嬪簱鎺ラ┏浣�, "AGV"); + } + } + else + { + LogHelper.Info($"浠诲姟鍙凤細{taskNo},绔嬪簱娌℃湁婊¤冻鏉′欢鐨勭┖璐т綅", "AGV"); + } + } } } } -- Gitblit v1.9.1