Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
@@ -443,7 +443,7 @@ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) { if (task.TaskType == (int)TaskOutboundTypeEnum.InToOut) if (task.TaskType == (int)TaskOutboundTypeEnum.InToOut && taskDTO.RoadWay.Contains("CW")) { var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1017" && x.stationType == 10&&x.Roadway==taskDTO.RoadWay); task.TaskState = (int)TaskOutStatusEnum.OutNew; Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -257,7 +257,6 @@ ConsoleHelper.WriteErrorLine($"当前托盘存在任务：【{command.ConveyorLineBarcode}】"); WriteInfo(conveyorLine.DeviceName, $"当前托盘存在任务{command.ConveyorLineBarcode}"); return; } var content = CreateAndSendTask(taskDTO); @@ -268,7 +267,6 @@ { var taskCommand = MapTaskCommand(task, command); //conveyorLine.SendCommand(taskCommand, childDeviceCode); bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode); if (sendFlag) { @@ -276,7 +274,6 @@ } } } //} } }
@@ -103,16 +103,8 @@ ConsoleHelper.WriteColorLine(builder, ConsoleColor.Blue); commonStackerCrane.LastTaskType = task.TaskType; if(task.TaskType == (int)TaskOutboundTypeEnum.InToOut) { task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting; _taskRepository.AddData(task); _taskService.StackCraneTaskCompleted(task.TaskNum); } else { _taskService.UpdateTaskStatusToNext(task.TaskNum); } } } else @@ -179,6 +171,24 @@ if (task == null) commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5); if (commonStackerCrane.DeviceCode.Contains("CW") && task.TaskType==(int)TaskOutboundTypeEnum.InToOut) { var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1017" && x.stationType == 10 && x.Roadway == commonStackerCrane.DeviceCode); IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationinfo.stationPLC); if (device != null) { CommonConveyorLine_GW conveyorLine = (CommonConveyorLine_GW)device; conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, Convert.ToInt16(1815), stationinfo.stationChildCode); Thread.Sleep(100); conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, 1000, stationinfo.stationChildCode); } WriteInfo(commonStackerCrane.DeviceName, $"【手动出库记录】"); } if (commonStackerCrane.DeviceCode.Contains("GW") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) { var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress); Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationErrorService.cs
@@ -51,8 +51,7 @@ var threeHoursAgo = now.Subtract(TimeSpan.FromHours(3)); var data = BaseDal.Db.Queryable<DtLocationInfo>() .Where(x => x.LocationStatus != 2 && x.LocationStatus != 0) .Where(x => x.EnalbeStatus != 1) .Where(x => x.LocationStatus != 2 && x.LocationStatus != 0|| x.EnalbeStatus != 1) .WhereIF(!wheres.IsNullOrEmpty(), wheres) .OrderBy(orderByModels) .ToPageList(options.Page, options.Rows, ref totalCount); Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
@@ -140,7 +140,7 @@ { Dt_Task task = new Dt_Task { Grade = 1, Grade = 3, Roadway = location.RoadwayNo, TargetAddress = "001-035-001", Dispatchertime = DateTime.Now, Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -184,28 +184,33 @@ if (!result.Success) { //var taskNG = new Dt_Task //{ // CurrentAddress = input.Position, // Grade = 1, // Roadway = input.Roadways, // TargetAddress = stationManager.stationNGLocation, // Dispatchertime = DateTime.Now, // MaterialNo = "", // NextAddress = stationManager.stationNGChildCode, // OrderNo = null, // PalletCode = input.PalletCode, // SourceAddress = stationManager.stationLocation, // TaskState = (int)TaskInStatusEnum.Line_InFinish, // TaskType = (int)TaskOutboundTypeEnum.InToOut, // TaskNum = await BaseDal.GetTaskNo(), // Creater = "System", // ProductionLine = result.ProductionLine, // ProcessCode = result.ProcessCode, //}; //return taskNG; List<string> strings = new List<string>() { "2036","2038","2084","2086"}; if (input.Position.Contains(strings)) { Console.WriteLine($"{result.MOMMessage}"); return null; } var taskNG = new Dt_Task { CurrentAddress = input.Position, Grade = 1, Roadway = input.Roadways, TargetAddress = stationManager.stationNGLocation, Dispatchertime = DateTime.Now, MaterialNo = "", NextAddress = stationManager.stationNGChildCode, OrderNo = null, PalletCode = input.PalletCode, SourceAddress = stationManager.stationLocation, TaskState = (int)TaskInStatusEnum.Line_InFinish, TaskType = (int)TaskOutboundTypeEnum.InToOut, TaskNum = await BaseDal.GetTaskNo(), Creater = "System", ProductionLine = result.ProductionLine, ProcessCode = result.ProcessCode, }; return taskNG; } if (result.SerialNos.Count <= 0) @@ -606,11 +611,17 @@ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System"; var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway); if(location != null) { int lastStatus = location.LocationStatus; location.LocationStatus = (int)LocationEnum.Free; _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum); } task.TaskState = (int)TaskOutStatusEnum.OutFinish; _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum); // 事务处理 await _unitOfWorkManage.UseTranAsync(async () => { @@ -620,8 +631,10 @@ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails); await AddStockInfoHtyAsync(stockInfo_Hty); } if (location != null) { await UpdateLocationAsync(location); } await DeleteTaskAsync(task.TaskId); await AddTaskHtyAsync(taskHty); });
