From a99ceecce8c9a2521ac1fc167f4eff764cbdb123 Mon Sep 17 00:00:00 2001 From: 海波 张 <2956280567@qq.com> Date: 星期一, 19 五月 2025 17:35:18 +0800 Subject: [PATCH] bug优化 --- wms/TaskHelper.cs | 91 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 73 insertions(+), 18 deletions(-) diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs index cc450d3..57a8127 100644 --- a/wms/TaskHelper.cs +++ b/wms/TaskHelper.cs @@ -49,6 +49,14 @@ return task; } + //鏌ユ壘WCS绔嬪簱浠诲姟 鍙傛暟浣滀笟缂栫爜,璋冨害绫诲瀷 agv/wcs + internal static WMSTask GetTaskByWorkNo(string no,string type) + { + var db = new SqlHelper<WMSTask>().GetInstance(); + var task = db.Queryable<WMSTask>().Where(a => a.S_OP_CODE == no && a.S_SCHEDULE_TYPE== type).First(); + return task; + } + internal static WMSTask GetTaskByCntrCode(string cntrCode) { @@ -235,13 +243,15 @@ { var tasks = new List<Task>(); + + // 浠诲姟1 var task1 = new WMSTask() { // 浣滀笟缂栫爜 S_OP_CODE = operation.S_CODE, // 浠诲姟鍙�- S_CODE = GenerateTaskNo(), + S_CODE = operation.S_CODE + "_1", // 浠诲姟绫诲瀷 N_TYPE = operation.N_TYPE, // 浠诲姟绫诲瀷 @@ -250,6 +260,10 @@ S_START_LOC = operation.S_START_LOC, // 璧风偣搴撳尯 S_START_AREA = operation.S_START_AREA, + //璧风偣搴撳尯鍚嶇О + S_START_AREA_NAME = operation.S_START_AREA_NAME, + //缁堢偣搴撳尯鍚嶇О + S_END_AREA_NAME = operation.S_END_AREA_NAME, // 缁堢偣璐т綅 S_END_LOC = operation.S_END_LOC, // 缁堢偣搴撳尯 @@ -266,6 +280,10 @@ N_PRIORITY = operation.N_PRIORITY, //宸ヨ绫诲瀷 TOOLSTYPE = operation.TOOLSTYPE, + + + + }; try @@ -335,6 +353,10 @@ N_PRIORITY = operation.N_PRIORITY, //宸ヨ绫诲瀷 TOOLSTYPE = operation.TOOLSTYPE, + //璧风偣搴撳尯鍚嶇О + S_START_AREA_NAME = operation.S_START_AREA_NAME, + //缁堢偣搴撳尯鍚嶇О + S_END_AREA_NAME = operation.CONNECTION_AREA, }; @@ -369,6 +391,10 @@ N_PRIORITY = operation.N_PRIORITY, //宸ヨ绫诲瀷 TOOLSTYPE = operation.TOOLSTYPE, + //璧风偣搴撳尯鍚嶇О + S_START_AREA_NAME = operation.CONNECTION_AREA, + //缁堢偣搴撳尯鍚嶇О + S_END_AREA_NAME = operation.S_END_AREA_NAME, }; try @@ -411,7 +437,7 @@ // 浣滀笟缂栫爜 S_OP_CODE = operation.S_CODE, // 浠诲姟鍙�- S_CODE = operation.S_CODE + "_2", + S_CODE = operation.S_CODE + "_1", // 浠诲姟绫诲瀷 N_TYPE = operation.N_TYPE, // 浠诲姟绫诲瀷 @@ -436,6 +462,10 @@ N_PRIORITY = operation.N_PRIORITY, //宸ヨ绫诲瀷 TOOLSTYPE = operation.TOOLSTYPE, + //璧风偣搴撳尯鍚嶇О + S_START_AREA_NAME = operation.S_START_AREA_NAME, + //缁堢偣搴撳尯鍚嶇О + S_END_AREA_NAME = operation.CONNECTION_AREA, }; // 浠诲姟2 @@ -444,7 +474,7 @@ // 浣滀笟缂栫爜 S_OP_CODE = operation.S_CODE, // 浠诲姟鍙�- S_CODE = operation.S_CODE + "_1", + S_CODE = operation.S_CODE + "_2", // 浠诲姟绫诲瀷 N_TYPE = operation.N_TYPE, // 浠诲姟绫诲瀷 @@ -469,6 +499,10 @@ N_PRIORITY = operation.N_PRIORITY, //宸ヨ绫诲瀷 TOOLSTYPE = operation.TOOLSTYPE, + //璧风偣搴撳尯鍚嶇О + S_START_AREA_NAME = operation.CONNECTION_AREA, + //缁堢偣搴撳尯鍚嶇О + S_END_AREA_NAME = operation.S_END_AREA_NAME, }; try @@ -534,7 +568,26 @@ return ac; } - + /// <summary> + /// 浠诲姟鎷︽埅 + /// </summary> + /// <param name="task"></param> + /// <returns></returns> + internal static bool Intercept() + { + var db = new SqlHelper<object>().GetInstance(); + + var model = db.Queryable<ManualTaskSwitch>().First(); + if (model != null && model.State == "Y") + { + return false; + } + else + { + return true; + } + + } internal static bool WcsAddActionRecord(string no, string state, string forkliftNo, string extData = "0") @@ -558,18 +611,18 @@ var db = new SqlHelper<WmsTaskAction>().GetInstance(); return db.Queryable<WmsTaskAction>().Count(a => a.S_TASK_CODE.Trim() == no.Trim() && a.S_ACTION == code) > 0; } - internal static void Begin(WMSTask task,string avgNo) { - var db = new SqlHelper<WMSTask>().GetInstance(); - if (task != null) { - if (task.S_B_STATE.Trim() == "宸叉帹閫�) { - task.S_B_STATE = "鎵ц涓�; - task.T_START_TIME = DateTime.Now; - task.S_EQ_NO = avgNo; - db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_START_TIME,it.S_EQ_NO }).ExecuteCommand(); - } + //internal static void Begin(WMSTask task,string avgNo) { + // var db = new SqlHelper<WMSTask>().GetInstance(); + // if (task != null) { + // if (task.S_B_STATE.Trim() == "宸叉帹閫�) { + // task.S_B_STATE = "鎵ц涓�; + // task.T_START_TIME = DateTime.Now; + // task.S_EQ_NO = avgNo; + // db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_START_TIME,it.S_EQ_NO }).ExecuteCommand(); + // } - } - } + // } + //} internal static WcsRfidCheckoutEntitys GetRfid(string TaskCode) { @@ -581,7 +634,7 @@ - internal static void Begin(WMSTask task) + internal static void Begin(WMSTask task, string avgNo="") { var db = new SqlHelper<WMSTask>().GetInstance(); if (task != null) @@ -590,8 +643,9 @@ { task.N_B_STATE = 2; task.S_B_STATE = WMSTask.GetStateStr(task.N_B_STATE); + task.S_EQ_NO = avgNo; task.T_START_TIME = DateTime.Now; - db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME }).ExecuteCommand(); + db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME,it.S_EQ_NO }).ExecuteCommand(); } } } @@ -680,7 +734,8 @@ { task.N_B_STATE = 5; task.S_B_STATE = WMSTask.GetStateStr(task.N_B_STATE); - db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand(); + task.T_END_TIME = DateTime.Now; + db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE,it.T_END_TIME}).ExecuteCommand(); } } -- Gitblit v1.9.1