Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

dengjunjie

2025-01-19 91e8cc5b5410418f45066d30352031b5a6ae08f0

 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/ConveyorLineJob_BC.cs

@@ -172,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);
@@ -240,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);
@@ -269,7 +271,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)
@@ -281,6 +282,7 @@
                                //        }
                                //    }
                                //}
                                //else
                            }
                            else if (!conveyorLineSignalRead.STB && conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && conveyorLineSignalWrite.STB && !conveyorLineSignalWrite.ACK)
                            {