1

hutongqing

2025-01-15 c1dabdd0e0a41e7b2b6c5f1b2b9d095debe15c49

1

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/76b34398-56f7-412e-a330-a8b8def683e9.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/c470cd75-662b-44ab-b67b-80ff3d784fdc.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e71bb6b0-ca4d-4741-bf57-ee29ee9f03f6.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -39,6 +39,19 @@
        /// </summary>
        [Description("MES出库")]
        MesOutbound = 200,

        /// <summary>
        /// MES手动出库
        /// </summary>
        [Description("MES手动出库")]
        MesHandOutbound = 210,

        /// <summary>
        /// MES手动拣选出库
        /// </summary>
        [Description("MES手动拣选出库")]
        MesHandPickOutbound = 220,

        /// <summary>
        /// é‡‡è´­å…¥åº“
        /// </summary>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs

@@ -17,13 +17,13 @@
    {
        private readonly IHttpContextAccessor _httpContextAccessor;
        private readonly IRouterExtension _routerExtension;
        private readonly WebSocketServer _webSocketServer;
        //private readonly WebSocketServer _webSocketServer;

        public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension, WebSocketServer webSocketServer) : base(service)
        public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension/*, WebSocketServer webSocketServer*/) : base(service)
        {
            _httpContextAccessor = httpContextAccessor;
            _routerExtension = routerExtension;
            _webSocketServer = webSocketServer;
            //_webSocketServer = webSocketServer;
        }

        [HttpPost, Route("ReceiveTask"), AllowAnonymous]
@@ -79,18 +79,18 @@
            return WebResponseContent.Instance.OK(data: _routerExtension.GetEndPoint(startPoint, routeType));
        }

        [HttpPost, HttpGet, Route("WebSocketPushMessage"), AllowAnonymous]
        public WebResponseContent WebSocketPushMessage(string message)
        {
            try
            {
                 _webSocketServer.PublishAllClientPayload(message);
                return WebResponseContent.Instance.OK();
            }
            catch(Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        //[HttpPost, HttpGet, Route("WebSocketPushMessage"), AllowAnonymous]
        //public WebResponseContent WebSocketPushMessage(string message)
        //{
        //    try
        //    {
        //         _webSocketServer.PublishAllClientPayload(message);
        //        return WebResponseContent.Instance.OK();
        //    }
        //    catch(Exception ex)
        //    {
        //        return WebResponseContent.Instance.Error(ex.Message);
        //    }
        //}
    }
}

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/HostedService/WarehouseHostedService.cs

@@ -13,13 +13,13 @@
    {
        private readonly ICacheService _cacheService;
        private readonly DBContext _dbContext;
        private readonly WebSocketServer _webSocketServer;
        //private readonly WebSocketServer _webSocketServer;

        public WarehouseHostedService(ICacheService cacheService, DBContext dbContext, WebSocketServer webSocketServer)
        public WarehouseHostedService(ICacheService cacheService, DBContext dbContext/*, WebSocketServer webSocketServer*/)
        {
            _cacheService = cacheService;
            _dbContext = dbContext;
            _webSocketServer = webSocketServer;
            //_webSocketServer = webSocketServer;
        }

        public Task StartAsync(CancellationToken cancellationToken)

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

@@ -51,7 +51,7 @@
builder.Services.AddHostedService<WarehouseHostedService>();
builder.Services.AddHostedService<QuartzJobDataTableHostedService>();

builder.Services.AddWebSocketSetup();
//builder.Services.AddWebSocketSetup();

builder.Services.AddAutoMapperSetup();


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

@@ -198,7 +198,7 @@
                                task.NextAddress = router.NextPosi;
                                task.DeviceCode = router.ChildPosi;
                            }
                            else if (item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt())
                            else if (item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt() || item.TaskType == TaskTypeEnum.MesHandOutbound.ObjToInt() || item.TaskType == TaskTypeEnum.MesHandPickOutbound.ObjToInt())
                            {
                                task.NextAddress = router.NextPosi;
                                task.DeviceCode = stationManger.StackerCraneCode;

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

@@ -178,15 +178,15 @@
                        if (router == null)
                        {
                            router = _routerRepository.QueryFirst(x=>x.ChildPosi == deviceCode && x.ChildPosiDeviceCode == stationManger.StationDeviceCode && x.NextPosi == stationManger.StationCode && x.InOutType == task.TaskType && x.IsEnd);
                            if (router == null)
                            if (router != null && router.IsEnd)
                            {
                                _taskService.TaskCompleted(taskNum);
                            }
                            else
                            {
                                _taskService.UpdateTaskExceptionMessage(taskNum, $"未找到路由信息,{task.NextAddress}");
                                WriteError(deviceCode, $"未找到路由信息,{task.NextAddress}");
                                return WebResponseContent.Instance.Error($"未找到路由信息,{task.NextAddress}");
                            }
                            else
                            {
                                _taskService.TaskCompleted(taskNum);
                            }
                        }


 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/addMesOutOrder.vue

@@ -105,7 +105,7 @@
      this.http
        .post("/api/mesOutboundOrder/AddMesOrder", params, "数据处理中...")
        .then((res) => {
          if (!res.status) return this.$message.error(x.message);
          if (!res.status) return this.$message.error(res.message);
          this.$message.success("操作成功");
          this.showDetailBox = false;
          this.$emit("parentCall", ($vue) => {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/96c7184b-65d8-46e3-940a-58fc39eb0955.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9810d861-42a0-437f-a9ad-8e033478a6cd.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -383,7 +383,7 @@
                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
                _unitOfWorkManage.BeginTran();

                if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
                if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.MesHandPickOutbound.ObjToInt() || task.TaskType == TaskTypeEnum.MesHandOutbound.ObjToInt())
                {
                    if (outboundOrderDetails.Count > 0)
                    {

 ´úÂë¹ÜÀí/»´°²PDA/common/config.js

@@ -1,5 +1,5 @@
let config = {
    baseUrl: 'http://10.30.4.92:9293',
    baseUrl: 'http://localhost:9293',
    urls: [
        'http://10.30.4.92:9283',
        'http://10.30.4.92:9283'