icewint/wcs_server_kate_suzhou
5
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

<fix>[normal]修改上报料箱到达的定时器间隔；添加测试条件

Browse Source
This commit is contained in:
葛林强 2024-07-28 15:19:56 +08:00
parent f384489dd0
commit 99d6668cf2
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WcsMain/Business/CirculationTask/Convey/PickStandButton.cs
View File

@ -23,7 +23,7 @@ public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation c
/// 当拣选站站台按钮按下时上传 wms /// 当拣选站站台按钮按下时上传 wms
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[Circulation("拣选站按钮按下上报", 500)] [Circulation("拣选站按钮按下上报", 300)]
public bool UploadInfo() public bool UploadInfo()
{ {
if (_pickStands == default) if (_pickStands == default)
@ -45,7 +45,9 @@ public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation c
int pickButtonStatus = conveyOperation.GetAllowPickStandGo(pickStand.StandId!); int pickButtonStatus = conveyOperation.GetAllowPickStandGo(pickStand.StandId!);
if (pickButtonStatus != 1) return; if (pickButtonStatus != 1) return;
ConsoleLog.Info($"【提示】拣选站：{pickStand.StandId} 按钮已经按下"); ConsoleLog.Info($"【提示】拣选站：{pickStand.StandId} 按钮已经按下");
conveyOperation.AllowPickStandGo(pickStand.StandId!, 2);
ConsoleLog.Success($"{pickStand.StandId}按钮按下，调试阶段直接放行");
return;
// 发送wms按钮按下 // 发送wms按钮按下
UploadPickStandRequest request = new UploadPickStandRequest() UploadPickStandRequest request = new UploadPickStandRequest()
{ {

2
WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs
View File

@ -22,7 +22,7 @@ public class UploadBoxArrive(AppConveyStandDao conveyStandDao, ConveyOperation c
/// 拣选台上报料箱 /// 拣选台上报料箱
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[Circulation("拣选台上报料箱")] [Circulation("拣选台上报料箱", 300)]
public bool UploadInfo() public bool UploadInfo()
{ {
if (_pickStands == default) if (_pickStands == default)

3
WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs
View File

@ -51,7 +51,7 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT
} }
if (wmsTask.TaskType == (int)WmsTaskTypeEnum.outTask) 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); bool checkResult = CommonData.AppLocations.ExistWmsLocation(wmsTask.Origin, wmsTask.Destination);
if (!checkResult) if (!checkResult)
@ -123,7 +123,6 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT
TaskStatus = (int)WcsTaskStatusEnum.create, TaskStatus = (int)WcsTaskStatusEnum.create,
TaskCategory = (int)TaskCategoryEnum.stacker, TaskCategory = (int)TaskCategoryEnum.stacker,
Origin = wcsOrigin!.WcsLocation, Origin = wcsOrigin!.WcsLocation,
Destination = wcsDestination.WcsLocation, Destination = wcsDestination.WcsLocation,
VehicleNo = wmsTask.VehicleNo, VehicleNo = wmsTask.VehicleNo,
PlcVehicleNo = wmsTask.VehicleNo.ToPlcVehicleNo(), PlcVehicleNo = wmsTask.VehicleNo.ToPlcVehicleNo(),

2
WcsMain/EquipOperation/Convey/ConveyOperation.cs
View File

@ -213,7 +213,7 @@ public class ConveyOperation
public string AllowPickStandGo(string pickStandId, short router) public string AllowPickStandGo(string pickStandId, short router)
{ {
if (!CommonData.IsConnectPlc || CommonTool.Siemens == default) return "PLC尚未连接。"; 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 ?? "写入失败"; // 读取失败 if (!writeResult.Success) return writeResult.Message ?? "写入失败"; // 读取失败
return string.Empty; return string.Empty;
} }