1

hutongqing

2025-01-13 8baeba33d75be5ae6bffbffa3ae3427b3d7891d4

1

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/9322c121-b454-4586-9898-3e1db55e94db.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e4c6b3e1-f737-41da-b6c2-b936ca7e1d6d.vsidx

Binary files differ

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

@@ -57,7 +57,7 @@
                }
                Dt_TaskExecuteDetail taskExecuteDetail = new()
                {
                    IsManual = App.User.UserId > 0,
                    IsManual = App.User?.UserId > 0,
                    IsNormal = isNormal,
                    TaskNum = taskNum,
                    TaskId = taskId,
@@ -93,7 +93,7 @@
                    }
                    Dt_TaskExecuteDetail taskExecuteDetail = new()
                    {
                        IsManual = App.User.UserId > 0,
                        IsManual = App.User?.UserId > 0,
                        IsNormal = isNormal,
                        TaskNum = taskNum,
                        TaskId = task.TaskId,

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

@@ -227,7 +227,8 @@
                            {
                                task.NextAddress = "";
                                task.DeviceCode = "";
                            }                        }
                            }
                        }
                    }
                    else
                    {

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

@@ -95,7 +95,7 @@
            string address = AppSettings.Get("WMSApiAddress");
            if (!string.IsNullOrEmpty(address))
            {
                HttpHelper.Post($"{address}/api/Task/UpdateTaskInfo", task.Serialize());
                //HttpHelper.Post($"{address}/api/Task/UpdateTaskInfo", task.Serialize());
            }
            


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

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
@@ -84,14 +85,40 @@
                                    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);

                                        string currentAddress = task.CurrentAddress;
                                        string nextAddress = task.NextAddress;
                                        TaskStatusEnum taskState = TaskStatusEnum.Line_Executing;
                                        List<Dt_Router> routers = _routerService.QueryNextRoutes(item.StationCode, task.Roadway, task.TaskType);
                                        if (routers == null || routers.Count == 0)
                                        {
                                            WriteError(item.StationName, $"未找到对应路由信息,设备编号:{item.StationCode},任务号:{task.TaskNum}");
                                            continue;
                                        }
                                        if (routers.Count > 1)
                                        {
                                            WriteError(item.StationName, $"路由信息配置错误,设备编号:{item.StationCode},任务号:{task.TaskNum}");
                                            continue;
                                        }
                                        Dt_Router router = routers.FirstOrDefault();
                                        if (router.IsEnd)
                                        {
                                            currentAddress = item.StackerCraneStationCode;
                                            nextAddress = task.TargetAddress;
                                            taskState = TaskStatusEnum.SC_Execute;
                                            device.SetValue(W_ConveyorLineDB.EndPos, task.CurrentAddress, item.StationCode);
                                        }
                                        else
                                        {
                                            device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
                                        }
                                        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);
                                        _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress);
                                    }
                                    else
                                    {
                                    List<Dt_Router> routers = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt());

                                    List<string> stations = routers.Select(x => x.NextPosi).ToList();
@@ -105,16 +132,47 @@
                                            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);
                                                    Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == item.StationCode);
                                                    if (router == null)
                                                    {
                                                        WriteError(item.StationName, $"未找到对应路由信息,设备编号:{item.StationCode},任务号:{task.TaskNum}");
                                                        continue;
                                                    }
                                                    string currentAddress = task.CurrentAddress;
                                                    string nextAddress = task.NextAddress;
                                                    TaskStatusEnum taskState = TaskStatusEnum.Line_Executing;

                                                device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode);
                                                device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);
                                                    if (router.NextPosi != task.NextAddress)
                                                    {
                                                        currentAddress = item.StackerCraneStationCode;
                                                        nextAddress = task.TargetAddress;
                                                        taskState = TaskStatusEnum.SC_Execute;
                                                        device.SetValue(W_ConveyorLineDB.EndPos, task.CurrentAddress, item.StationCode);
                                                    }
                                                    else
                                                    {
                                                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);
                                                    _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress);
                                                    //continue;

                                                    //_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);
                                            }
                                        }
                                    }
                                    }

                                }
                                else//生产退库
                                {
@@ -125,6 +183,7 @@
                                        if(router == null)
                                        {
                                            WriteError(item.StationName, $"未找到对应路由信息,设备编号:{item.StationCode},任务号:{task.TaskNum}");
                                            continue;
                                        }

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

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/062176ae-3338-43a8-9030-bb1a16e68b97.vsidx

Binary files differ

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

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7a1d86c3-20b2-4990-9550-dcdae2deefdc.vsidx

Binary files differ

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

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/ISys_MenuRepository.cs

@@ -13,6 +13,8 @@
    public interface ISys_MenuRepository : IRepository<Sys_Menu>
    {
        List<MenuDTO> GetAllMenu();

        List<MenuDTO> GetAllPDAMenu();
        /// <summary>
        /// èŽ·å–所有PDA权限
        /// </summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_MenuRepository.cs

@@ -45,6 +45,26 @@
            return _menus;
        }

        public List<MenuDTO> GetAllPDAMenu()
        {
            List<Sys_Menu> menus = base.QueryData(x => (x.Enable == 1 || x.Enable == 2) && x.MenuType == 1).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
            List<MenuDTO> _menus = _mapper.Map<List<MenuDTO>>(menus);
            _menus.ForEach(x =>
            {
                if (!string.IsNullOrEmpty(x.Auth) && x.Auth.Length > 10)
                {
                    try
                    {
                        x.Actions = x.Auth.DeserializeObject<List<ActionDTO>>();
                    }
                    catch { }
                }
                x.Actions ??= new List<ActionDTO>();
            });
            string test = _menus.Serialize();
            return _menus;
        }

        public List<MenuDTO> GetAllMenuPDA()
        {
            //List<Sys_Menu> menus = base.QueryData(x => (x.Enable == 1 || x.Enable == 2) && x.MenuType == App.User.MenuType).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
@@ -63,10 +83,10 @@
            //});
            if (App.User.IsRoleIdSuperAdmin(App.User.RoleId))
            {
                return GetAllMenu();
                return GetAllPDAMenu();
            }
            List<int> menuIds = GetPermissions(App.User.RoleId).Select(x => x.MenuId).ToList();
            return GetAllMenu().Where(x => menuIds.Contains(x.MenuId)).ToList();
            return GetAllPDAMenu().Where(x => menuIds.Contains(x.MenuId)).ToList();
        }

        public object GetSuperAdminMenu()