美瑞安淮安立体仓库
上一版本: 66b9fa02 | 补丁 | 提交 | 忽略空白
1
hutongqing
2025-01-12 e880a68169b62dfaad14db7b6cdd4c8e0d3fcb75 
1
已删除2个文件
已修改2个文件
已添加3个文件
48 ■■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e4c6b3e1-f737-41da-b6c2-b936ca7e1d6d.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f0f1270a-ac4e-4e2b-b52d-3beb9a80089a.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/ConveyorLineJob_BC.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/35b9e878-61a3-436f-b549-08084babf3ff.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8418c4b5-1bc9-4cbc-b42e-fc61309bcce6.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bf8cf5bc-82f5-4dba-96c7-5fd79b33c418.vsidx 补丁 | 查看 | 原始文档 | blame | 历史 
 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e4c6b3e1-f737-41da-b6c2-b936ca7e1d6d.vsidx

Binary files differ



 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f0f1270a-ac4e-4e2b-b52d-3beb9a80089a.vsidx

Binary files differ



 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs


@@ -217,9 +217,17 @@


                        }


                        else


                        {


                            task.NextAddress = "";


                            task.DeviceCode = "";


                        }


                            List<Dt_Router> dt_Routers = _routerService.QueryNextRoutes(item.SourceAddress, item.RoadWay, item.TaskType);


                            if(dt_Routers != null && dt_Routers.Count > 0)


                            {


                                task.NextAddress = dt_Routers.FirstOrDefault().NextPosi;


                                task.DeviceCode = dt_Routers.FirstOrDefault().ChildPosiDeviceCode;


                            }


                            else


                            {


                                task.NextAddress = "";


                                task.DeviceCode = "";


                            }                        }


                    }


                    else


                    {




 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/°å²Ä²Ö/ConveyorLineJob_BC.cs


@@ -81,6 +81,17 @@


                            {


                                if (conveyorLineInfoRead.TaskNum == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//采购入库


                                {


                                    Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.DeviceCode == item.StationDeviceCode && (x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.New.ObjToInt()));


                                    if(task != null)


                                    {


                                        _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);




                                        device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);


                                    }


                                    List<Dt_Router> routers = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt());




                                    List<string> stations = routers.Select(x => x.NextPosi).ToList();


@@ -88,10 +99,20 @@


                                    WebResponseContent responseContent = _taskService.RequestWMSAssignRoadway(stations);


                                    if (responseContent.Status)


                                    {


                                        WebResponseContent content = _taskService.RequestWMSTask(conveyorLineInfoRead.Barcode, item.StationCode);


                                        WebResponseContent content = _taskService.RequestWMSTask(conveyorLineInfoRead.Barcode, item.StationCode, responseContent.Data.ToString());


                                        if (content.Status)


                                        {


                                            device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);


                                            task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.DeviceCode == item.StationDeviceCode && (x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.New.ObjToInt()));


                                            if (task != null)


                                            {


                                                _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);




                                                device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode);


                                                device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);


                                                device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);


                                                device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);


                                                device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);


                                            }


                                        }


                                    }


                                }


@@ -100,13 +121,20 @@


                                    Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.TaskNum && x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType)); // å¸¦ä»»åŠ¡å·æŸ¥è¯¢ä»»åŠ¡


                                    if (task != null)


                                    {


                                        Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == item.StationCode);


                                        if(router == null)


                                        {


                                            WriteError(item.StationName, $"未找到对应路由信息,设备编号:{item.StationCode},任务号:{task.TaskNum}");


                                        }




                                        Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == item.StationCode);


                                        if (stationManger == null)


                                        {


                                            WriteError(item.StationName, $"未找到对应站台信息,设备编号:{item.StationCode},任务号:{task.TaskNum}");


                                            continue;


                                        }


                                        string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);




                                        string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, router.NextPosi);


                                        if (string.IsNullOrEmpty(locationCode))


                                        {


                                            WriteError(item.StationName, $"请求分配货位返回信息错误,设备编号:{item.StationCode},任务号:{task.TaskNum}");




 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/35b9e878-61a3-436f-b549-08084babf3ff.vsidx

Binary files differ



 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8418c4b5-1bc9-4cbc-b42e-fc61309bcce6.vsidx

Binary files differ



 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bf8cf5bc-82f5-4dba-96c7-5fd79b33c418.vsidx

Binary files differ