From 112c9bd20afed95d582b7eb227075ab8d10cdd12 Mon Sep 17 00:00:00 2001 From: 海波 张 <2956280567@qq.com> Date: 星期二, 24 六月 2025 17:29:28 +0800 Subject: [PATCH] 金坛优化 --- process/TaskProcess.cs | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs index 85f22b8..5006ef2 100644 --- a/process/TaskProcess.cs +++ b/process/TaskProcess.cs @@ -263,16 +263,25 @@ var rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == wcsTask.S_END_AREA && x.status == "0" && x.roadWay == loc1.N_ROADWAY.ToString()).First(); if (rowdwa == null) { - LogHelper.Info($"鍒ゆ柇宸烽亾鍙敤,褰撳墠搴撳尯{wcsTask.S_END_AREA}褰撳墠宸烽亾{loc1.N_ROADWAY}鍙敤,涓嶉渶瑕佹敼閬�, "鏀归亾瀹夊叏浜や簰"); + LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鍒ゆ柇宸烽亾鍙敤,褰撳墠搴撳尯{wcsTask.S_END_AREA}褰撳墠宸烽亾{loc1.N_ROADWAY}鍙敤,涓嶉渶瑕佹敼閬�, "鏀归亾瀹夊叏浜や簰"); } else { - LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾", "鏀归亾瀹夊叏浜や簰"); + LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾", "鏀归亾瀹夊叏浜や簰"); var endLoc = LocationHelper.GetLocOne(wcsTask.S_END_LOC); + List<Location> endList; + if (!string.IsNullOrEmpty(workFlow.ZONECODE)) + { + endList = LocationHelper.GetZoneLoc(workFlow.ZONECODE); + } + else + { + endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA); + } - var endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA); + var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY); - LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾锛屾柊缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰"); + LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}锛屽綋鍓嶅贩閬撲笉鍙敤锛岄渶瑕佹敼閬擄紝鏂扮粓鐐逛俊鎭� + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰"); if (end == null) { LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�, "鏀归亾瀹夊叏浜や簰"); @@ -810,6 +819,10 @@ } db.CommitTran(); LogHelper.Info("缁戝畾瑙g粦", "缁撴潫"); + result.errMsg = "瑙g粦瀹屾垚"; + result.errCode = 0; + result.success = true; + return result; } } catch (Exception e) @@ -818,6 +831,7 @@ LogHelper.Info("鐗╂枡缁戝畾瑙g粦寮傚父:" + e.Message, "鐗╂枡缁戝畾瑙g粦"); result.errMsg = "鐗╂枡缁戝畾瑙g粦寮傚父"; result.errCode = 1; + result.success = false; return result; } return result; @@ -1849,6 +1863,14 @@ //鍒涘缓浣滀笟 if (WMSHelper.CreateWmsWork(operation)) { + if (connection!="") + { + LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2); + LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1); + LocationHelper.LockLoc(operation.CONNECTION, "鍏ュ簱閿�, 1); + } + + LogHelper.Info($"ZCSendTask鍑哄簱浣滀笟鍒涘缓鎴愬姛{operation.S_CODE}", "Mes浠诲姟涓嬪彂"); result.errMsg = "鍑哄簱浣滀笟鍒涘缓鎴愬姛"; result.errCode = 0; -- Gitblit v1.9.1