´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs
@@ -54,10 +54,7 @@ builder.Services.AddHostedService<WarehouseHostedService>(); builder.Services.AddHostedService<QuartzJobDataTableHostedService>(); //builder.Services.AddWebSocketSetup(); builder.Services.AddWebSocketSetup(); builder.Services.AddHostedService<WarehouseHostedService>(); builder.Services.AddAutoMapperSetup();
@@ -17,7 +17,6 @@ public Task Execute(IJobExecutionContext context) { Thread.Sleep(4320000); try { string address = AppSettings.Get("WMSApiAddress"); ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/³ÉÆ·²Ö/AGV_CPExtend.cs
@@ -25,7 +25,7 @@ var stationMangers = _stationMangerRepository.QueryData(); #region å ¥åºä»»å¡æ¨é { var newTasksIn = AllTasks.Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()) && x.TaskType>=TaskTypeEnum.Inbound.ObjToInt() && nameof(AGV_CPJob).Contains(x.DeviceCode) && !string.IsNullOrEmpty(x.DeviceCode) && x.TaskType!=999).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList(); var newTasksIn = AllTasks.Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()) && x.TaskType>=TaskTypeEnum.Inbound.ObjToInt() && nameof(AGV_CPJob).Contains(x.DeviceCode) && !string.IsNullOrEmpty(x.DeviceCode) && x.TaskType!=999).ToList().OrderByDescending(x => x.Grade).ThenBy(x => x.CreateDate).ToList(); if (newTasksIn.Count>0) { foreach (var task in newTasksIn) ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/°å²Ä²Ö/RGVJob_BC.cs
@@ -116,24 +116,6 @@ } if (item.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt()) { //if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode) && conveyorLineInfoRead.TaskNum == 0)//å ¥åº //{ // List<string> stations = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt()).Select(x => x.NextPosi).ToList(); // WebResponseContent responseContent = _taskService.RequestWMSTask(conveyorLineInfoRead.Barcode, item.StationCode, conveyorLineInfoRead.Spare2, stations); // if (responseContent.Status) // { // Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == conveyorLineInfoRead.Barcode && x.CurrentAddress == item.StationCode && x.DeviceCode == device.DeviceCode && x.TaskState == TaskStatusEnum.New.ObjToInt()); // if (task != null) // { // device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode); // device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode); // device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Inbound.ObjToInt(), item.StationCode); // device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode); // device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode); // _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing); // } // } //} if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode) && conveyorLineInfoRead.TaskNum == 0)//å ¥åº { @@ -152,7 +134,7 @@ } } } else if (conveyorLineSignalRead.STB /*&& conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm*/ && !conveyorLineSignalWrite.ACK && conveyorLineInfoRead.TaskNum > 0)//åºåº else if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK && conveyorLineInfoRead.TaskNum > 0)//åºåº { WriteDebug(device.DeviceName, $"ä»»å¡å®æ,ä»»å¡å·:{conveyorLineInfoRead.TaskNum}"); _taskService.TaskCompleted(conveyorLineInfoRead.TaskNum); ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs
@@ -296,7 +296,7 @@ if (string.IsNullOrEmpty(checkModel.CreatorCode)) { //ERPä¸æ¥ WebResponseContent responseContent = _checkOrderService.FeedbackCheckResult(checkOrder, checkOrderResult != null ? new List<Dt_CheckOrderResult> { checkOrderResult } : new List<Dt_CheckOrderResult>()); WebResponseContent responseContent = _checkOrderService.FeedbackCheckResult(checkOrder, checkOrderResult != null ? new List<Dt_CheckOrderResult> { checkOrderResult } : new List<Dt_CheckOrderResult>(),warehouse); if (!responseContent.Status) { throw new Exception(responseContent.Message); ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderService.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks; using WIDESEA_Common.CommonEnum; using WIDESEA_Common.OrderEnum; using WIDESEA_Common.WareHouseEnum; using WIDESEA_Core; using WIDESEA_Core.BaseRepository; using WIDESEA_Core.BaseServices; @@ -135,7 +136,7 @@ /// <param name="checkOrder"></param> /// <param name="checkOrderResults"></param> /// <returns></returns> public WebResponseContent FeedbackCheckResult(Dt_CheckOrder checkOrder,List<Dt_CheckOrderResult> checkOrderResults) public WebResponseContent FeedbackCheckResult(Dt_CheckOrder checkOrder,List<Dt_CheckOrderResult> checkOrderResults, Dt_Warehouse? warehouse=null) { try { @@ -152,6 +153,10 @@ }; checkResults.Add(checkResult); } if (warehouse!=null && (warehouse.WarehouseCode == WarehouseEnum.HA152.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA58.ToString())) { } ERPCheckModel model = new ERPCheckModel() { Code = checkOrder.CheckOrderNo, ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ICheckService/ICheckOrderService.cs
@@ -24,7 +24,11 @@ /// <param name="id"></param> /// <returns></returns> WebResponseContent FeedbackCheckResult(int id); WebResponseContent FeedbackCheckResult(Dt_CheckOrder checkOrder, List<Dt_CheckOrderResult> checkOrderResults); /// <summary> /// æ¨éæ¥ææ£éªç»æ /// </summary> /// <returns></returns> WebResponseContent FeedbackCheckResult(Dt_CheckOrder checkOrder, List<Dt_CheckOrderResult> checkOrderResults,Dt_Warehouse? warehouse=null); WebResponseContent FeedbackInspectResult(Dt_CheckOrder checkOrder, List<Dt_CheckOrderResult> checkOrderResults); } }
