From 3a0fef4ed5be4b2d3e9259fa0202fa42cb31c875 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期五, 21 二月 2025 16:56:43 +0800 Subject: [PATCH] 盘点功能,板料优化,PDA前端更新 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/ConveyorLineJob_BC.cs | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs" index 7f50783..0c5db6a 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs" @@ -114,6 +114,13 @@ _taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: item.StationDeviceCode, roadwayNo: responseContent.Data.ToString() ?? ""); } } + else + { + if (conveyorLineInfoWrite.Spare2 != 0) + { + WriteDebug(device.DeviceName, $"鍚姩淇″彿宸插啓鍏�"); + } + } #endregion } @@ -165,6 +172,7 @@ } else { + //task.NextAddress鍙兘鏄痳outer.NextPosi device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode); } device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode); @@ -172,6 +180,10 @@ device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode); device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode); _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode); + } + else + { + WriteInfo(device.DeviceName, $"鏈壘鍒版墭鐩榹conveyorLineInfoRead.Barcode}瀵瑰簲鐨勪换鍔′俊鎭�"); } #endregion } @@ -219,7 +231,7 @@ taskState = TaskStatusEnum.SC_Execute; deviceCode = item.StackerCraneCode; roadwayNo = responseContent.Data.ToString(); - device.SetValue(W_ConveyorLineDB.EndPos, task.CurrentAddress, item.StationCode); + device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode); } else { @@ -229,6 +241,7 @@ } else { + //task.NextAddress鍙兘鏄痳outer.NextPosi device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode); } device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode); @@ -237,8 +250,9 @@ device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode); _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode, roadwayNo: roadwayNo); } - #endregion + } + #endregion } } else if (!conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && conveyorLineSignalWrite.ACK) @@ -258,7 +272,6 @@ device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode); device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode); } - //else //{ // task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && string.IsNullOrEmpty(x.DeviceCode) && x.TaskState == TaskStatusEnum.New.ObjToInt() && x.WarehouseId == warehouseDevice.WarehouseId); // if (task != null) @@ -270,6 +283,7 @@ // } // } //} + //else } else if (!conveyorLineSignalRead.STB && conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && conveyorLineSignalWrite.STB && !conveyorLineSignalWrite.ACK) { -- Gitblit v1.9.3