| HH.WCS.Mobox3.RiDong/Program.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HH.WCS.Mobox3.RiDong/core/WCSCore.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HH.WCS.Mobox3.RiDong/generalMethod/TaskHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HH.WCS.Mobox3.RiDong/generalMethod/ThreadMenthod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HH.WCS.Mobox3.RiDong/wms/WCSHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HH.WCS.Mobox3.RiDong/Program.cs
@@ -91,13 +91,13 @@ // 创建出库单（DoOut） GetTask(ThreadMenthod.CreateOutboundOrderFromDoOut), // 创建出库作业 GetTaskS(ThreadMenthod.CreateOutTaskFromDistributionCntrDetail), GetTask(ThreadMenthod.CreateOutTaskFromDistributionCntrDetail), // 作业完成以及错误修改 GetTask(ThreadMenthod.AccomplishOperation), // Directory读取文件，并处理 GetTask(DirectoryHelper.GainData), // 出库agv任务推送 GetTask(ThreadMenthod.DispatchFromAGV), GetTaskS(ThreadMenthod.DispatchFromAGV), // 读取线体信息并做对应的处理 GetTask(ThreadMenthod.ReadConveyorlinesMessage) }; @@ -146,7 +146,7 @@ LogHelper.Error(ex.Message, ex); } Thread.Sleep(12000); Thread.Sleep(600000); } });
@@ -30,13 +30,17 @@ switch (model.State) { case 1: WCSHelper.Begin(task); WCSHelper.Begin2(task); break; case 3: WCSHelper.UpdateStatus(task, "开始取货"); break; case 4: // 开始取货 WCSHelper.Begin(task); WCSHelper.UpdateStatus(task, "取货完成"); // 货位解锁 EnterWareHouseService.LocationUnlock(task); break; HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs
@@ -131,8 +131,8 @@ var locations = sqlSugarClient.Queryable<Location>() .Where(p => p.N_PRIORITY == priority && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList(); // 优先查询今日份任务中未完成的（等待，执行中） var notQueryList = AdoSqlMethod<Operation>.QueryList(p=>p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today); var notQueryList = AdoSqlMethod<Task> .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2); if (notQueryList.Count > 0) { @@ -140,8 +140,8 @@ foreach (var item in groupBy) { if (item.Key == 1 || item.Key == 2 || item.Key == 3 || item.Key == 4) if ((item.Key == 1 || item.Key == 2 || item.Key == 3 || item.Key == 4) ) { locations = locations.Where(p=>p.N_ROADWAY != item.Key).ToList(); } @@ -174,8 +174,8 @@ var locations = sqlSugarClient.Queryable<Location>() .Where(p => p.N_PRIORITY == priority && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList(); // 优先查询今日份任务中未完成的（等待，执行中） var notQueryList = AdoSqlMethod<Operation>.QueryList(p=>p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today); var notQueryList = AdoSqlMethod<Task> .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2); if (notQueryList.Count > 0) { @@ -219,9 +219,8 @@ var locations = sqlSugarClient.Queryable<Location>() .Where(p => p.N_PRIORITY == i && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList(); // 优先查询今日份任务中未完成的（等待，执行中） var notQueryList = AdoSqlMethod<Operation> .QueryList(p=>p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3)); var notQueryList = AdoSqlMethod<Task> .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2); if (notQueryList.Count > 0) { HH.WCS.Mobox3.RiDong/generalMethod/TaskHelper.cs
@@ -391,7 +391,6 @@ { var outbound = AdoSqlMethod<OutboundOrder>.QueryFirst(p => p.S_NO == model.S_BS_NO); var operationDto = new OperationDto() { cntrCode = model.S_CNTR_CODE, @@ -413,6 +412,9 @@ if (oldoperation == null) { var queryFirst = AdoSqlMethod<Location>.QueryFirst(p=>p.S_CODE == model.S_LOC_CODE); var newoperation = new Operation() { S_CODE = HelperMethod.GenerateTaskNo("作业号", "OP"), @@ -426,7 +428,8 @@ S_END_AREA = Operation.GetArea(model.N_OUT_TYPE == 2 ? "CKK-1" : "JJCKK-1"), S_CNTR_CODE = model.S_CNTR_CODE, S_DC_NO = model.S_DC_NO, S_OUT_TARGET = outbound.S_OUT_TARGET S_OUT_TARGET = outbound.S_OUT_TARGET, N_ROADWAY = queryFirst.N_ROADWAY }; // 根据托盘号查询是否整托或分拣 HH.WCS.Mobox3.RiDong/generalMethod/ThreadMenthod.cs
@@ -64,7 +64,9 @@ { // 判断有没有已推送的任务，有的话不推送，没有就推送 // if(AdoSqlMethod<Task>.QueryCount(p=>(p.N_B_STATE == 1 || p.N_B_STATE == 2) && p.N_SCHEDULE_TYPE == 2 )) LogHelper.Info($"当前推送任务在第{task.N_ROADWAY}巷道"); LogHelper.Info($"当前推送任务在第{task.N_ROADWAY}巷道，任务编号为{task.S_CODE}"); // 出库AGV不做限制直接推送 if (TaskHelper.SendTaskFromAGV(task)) { HH.WCS.Mobox3.RiDong/wms/WCSHelper.cs
@@ -184,6 +184,19 @@ } } } internal static void Begin2(Task task) { var db = new SqlHelper<Task>().GetInstance(); if (task != null) { if (task.N_B_STATE == 1) { task.T_START_TIME = DateTime.Now; db.Updateable(task).UpdateColumns(it => new { it.T_START_TIME }).ExecuteCommand(); } } } internal static void End(Task task) { var db = new SqlHelper<Task>().GetInstance();
