From a7bc7b8dc6e31ce888a254c17b5587f59877d592 Mon Sep 17 00:00:00 2001 From: pulg <plg@Haninfo> Date: 星期三, 11 六月 2025 16:23:24 +0800 Subject: [PATCH] 1 --- HH.WCS.QingXiNongfu/wms/TaskHelper.cs | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs index f6dfb8d..cfb02d7 100644 --- a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs +++ b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs @@ -1,5 +1,4 @@ -锘縰sing HH.WCS.QingXigongchang.dispatch; -using HH.WCS.QingXigongchang.process; +锘縰sing HH.WCS.QingXigongchang.process; using HH.WCS.QingXigongchang.util; using Newtonsoft.Json; using SqlSugar; @@ -7,10 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using static HH.WCS.QingXigongchang.dispatch.NDC; namespace HH.WCS.QingXigongchang.wms { @@ -91,6 +86,17 @@ { var fromLoc = LocationHelper.GetLoc(from); var endLoc = LocationHelper.GetLoc(to); + if (fromLoc.S_AREA_CODE == "YWLRGDD") + { + //鏌ヨ浠诲姟琛� 瑕佹眰鏄彧鑳界敓鎴愪袱涓换鍔�璧风偣搴撳尯涓篩WLRGDD hh_plg 2025骞�鏈�鏃� + List<string> TaskState = new List<string>() { "瀹屾垚", "鍙栨秷" }; + var TaskListNum = LocationHelper.GetList<WMSTask>(x => x.S_START_LAREA == "YWLRGDD" && !TaskState.Contains(x.S_B_STATE)); + if (TaskListNum.Count() >= 2) + { + LogHelper.Info($"CreateTransport- CreateTask Error" + $"璧风偣搴撳尯涓篩WLRGDD 鍒欐渶澶氬彧鑳界敓鎴愪袱涓换鍔�); + return false; + } + } if (!taskType.Contains("娓呮邯绾哥")) { if (fromLoc == null || endLoc == null) @@ -212,6 +218,10 @@ task.T_END_TIME = DateTime.Now; db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_END_TIME }).ExecuteCommand(); } + if (task.S_END_LOC == "YWLWJJB") + { + var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_NOTE, "鍘熺墿鏂欐惉杩�绾哥", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY); + } } internal static void Fail(WMSTask task) { @@ -259,10 +269,12 @@ LogHelper.Info(wmsTask.S_START_LOC + "LockLoc:閿佺粨鏋� + res); model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == wmsTask.S_END_LOC).First(); - - model.S_LOCK_STATE = "鍏ュ簱閿�; - res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0; - LogHelper.Info(wmsTask.S_END_LOC + "LockLoc:閿佺粨鏋� + res); + if (wmsTask.S_START_LOC != "YWLWJJB") + { + model.S_LOCK_STATE = "鍏ュ簱閿�; + res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0; + LogHelper.Info(wmsTask.S_END_LOC + "LockLoc:閿佺粨鏋� + res); + } } db.Insertable(wmsTask).ExecuteCommand(); db.Ado.CommitTran(); -- Gitblit v1.9.1