diff --git a/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs b/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs index 5d0602f..320b73b 100644 --- a/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs +++ b/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs @@ -23,7 +23,7 @@ public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation c /// 当拣选站站台按钮按下时上传 wms /// /// - [Circulation("拣选站按钮按下上报", 500)] + [Circulation("拣选站按钮按下上报", 300)] public bool UploadInfo() { if (_pickStands == default) @@ -45,7 +45,9 @@ public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation c int pickButtonStatus = conveyOperation.GetAllowPickStandGo(pickStand.StandId!); if (pickButtonStatus != 1) return; ConsoleLog.Info($"【提示】拣选站:{pickStand.StandId} 按钮已经按下"); - + conveyOperation.AllowPickStandGo(pickStand.StandId!, 2); + ConsoleLog.Success($"{pickStand.StandId}按钮按下,调试阶段直接放行"); + return; // 发送wms按钮按下 UploadPickStandRequest request = new UploadPickStandRequest() { diff --git a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs b/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs index e8bca51..30f1cc6 100644 --- a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs +++ b/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs @@ -22,7 +22,7 @@ public class UploadBoxArrive(AppConveyStandDao conveyStandDao, ConveyOperation c /// 拣选台上报料箱 /// /// - [Circulation("拣选台上报料箱")] + [Circulation("拣选台上报料箱", 300)] public bool UploadInfo() { if (_pickStands == default) diff --git a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs b/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs index dc2dbff..76c5c57 100644 --- a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs +++ b/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs @@ -51,7 +51,7 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT } if (wmsTask.TaskType == (int)WmsTaskTypeEnum.outTask) { - wmsTask.Destination = string.IsNullOrEmpty(wmsTask.Destination) ? "R" : wmsTask.Destination; + wmsTask.Destination = string.IsNullOrEmpty(wmsTask.Destination) ? "C" : wmsTask.Destination; } bool checkResult = CommonData.AppLocations.ExistWmsLocation(wmsTask.Origin, wmsTask.Destination); if (!checkResult) @@ -123,7 +123,6 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT TaskStatus = (int)WcsTaskStatusEnum.create, TaskCategory = (int)TaskCategoryEnum.stacker, Origin = wcsOrigin!.WcsLocation, - Destination = wcsDestination.WcsLocation, VehicleNo = wmsTask.VehicleNo, PlcVehicleNo = wmsTask.VehicleNo.ToPlcVehicleNo(), diff --git a/WcsMain/EquipOperation/Convey/ConveyOperation.cs b/WcsMain/EquipOperation/Convey/ConveyOperation.cs index b6fad19..43f6d66 100644 --- a/WcsMain/EquipOperation/Convey/ConveyOperation.cs +++ b/WcsMain/EquipOperation/Convey/ConveyOperation.cs @@ -213,7 +213,7 @@ public class ConveyOperation public string AllowPickStandGo(string pickStandId, short router) { if (!CommonData.IsConnectPlc || CommonTool.Siemens == default) return "PLC尚未连接。"; - var (writeResult, _) = CommonTool.Siemens.WritePlcWhithName($"拣选站台释放{pickStandId}", router); + var (writeResult, _) = CommonTool.Siemens.WritePlcWhithName($"拣选确认按钮{pickStandId}", router); if (!writeResult.Success) return writeResult.Message ?? "写入失败"; // 读取失败 return string.Empty; }