1

huangxiaoqiang

2025-04-09 b8cd98f0a2d8a7e644563eb67d4c88371279a729

1

 Code Management/WCS/WIDESEAWCS_Client/src/api/http.js

@@ -20,7 +20,7 @@
}

else if (process.env.NODE_ENV == 'production') {
    axios.defaults.baseURL = 'http://192.168.20.253:9291/';
    axios.defaults.baseURL = 'http://192.168.15.253:9291/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
    axios.defaults.baseURL+="/";

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs

@@ -60,7 +60,7 @@
                    // 检查请求次数和时间限制
                    if (requestTracker.TryGetValue(requestKey, out var requestInfo))
                    {
                        if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(10))
                        if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(3))
                        {
                            // 如果请求次数超过限制且未超过10分钟，抛出异常
                            throw new InvalidOperationException("请求次数已达到限制，请稍后再试。");

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs

@@ -99,6 +99,15 @@
        [ExporterHeader(DisplayName = "生产产线")]
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "生产产线")]
        public string ProductionLine { get; set; }

        /// <summary>
        /// 巷道
        /// </summary>
        [ImporterHeader(Name = "巷道")]
        [ExporterHeader(DisplayName = "巷道")]
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "巷道")]
        public string Roadway { get; set; }
        

    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -23,6 +23,7 @@
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
@@ -768,7 +769,16 @@
                }
                var wmsIpAddress = wmsBase + requestTrayOutTask;

                var device = _deviceInfoRepository.QueryData(x => x.DeviceStatus == "1");
                List<string> strings = platform.Roadway.Split(',').ToList();
                List<Dt_DeviceInfo> device;
                if (strings.Count > 0)
                {
                    device = _deviceInfoRepository.QueryData(x => x.DeviceStatus == "1" && strings.Contains(x.DeviceCode));
                }
                else
                {
                    device = _deviceInfoRepository.QueryData(x => x.DeviceStatus == "1");
                }
                var deviceCode = device.Select(x => x.DeviceCode).ToList();

                // 发送HTTP POST请求获取任务数据

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs

@@ -54,7 +54,7 @@
        // 检查请求次数和时间限制
        if (requestTracker.TryGetValue(requestKey, out var requestInfo))
        {
            if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(10))
            if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(3))
            {
                // 如果请求次数超过限制且未超过10分钟，抛出异常
                throw new InvalidOperationException("请求次数已达到限制，请稍后再试。");

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs

@@ -146,5 +146,10 @@
        /// 是否入库空托盘
        /// </summary>
        public const string InboundIsEmpty = "InboundIsEmpty";

        public const string CHInboundEmptyProductLineOne = "CHInboundEmptyProductLineOne";


        public const string CHInboundEmptyProductLineTwo = "CHInboundEmptyProductLineTwo";
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -819,7 +819,39 @@
                if (stationManagers == null)
                    throw new Exception("未找到空托盘入库站台和入库站台配置");
            }
            List<string> strings = stationManagers.Roadway.Split(',').ToList();
            List<string> strings;
            if (input.Position == "1016-3")
            {
                var configOne = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.CHInboundEmptyProductLineOne);
                var configTwo = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.CHInboundEmptyProductLineTwo);

                List<string>  productLineconfigOne = configOne.ConfigValue.Split(',').ToList();
                List<string>  productLineconfigTwo = configTwo.ConfigValue.Split(',').ToList();

                if (productLineconfigOne.Count == 0 && productLineconfigTwo.Count() == 0)
                {
                    ConsoleHelper.WriteErrorLine($"未找到配置文件产线配置");
                    return content.Error("未找到配置文件产线配置");
                }
                if (productLineconfigOne.Contains(result.ProductionLine))
                {
                    strings = configOne.Remark.Split(',').ToList();
                }
                else if (productLineconfigTwo.Contains(result.ProductionLine))
                {
                    strings = configTwo.Remark.Split(',').ToList();
                }
                else
                {
                    ConsoleHelper.WriteErrorLine($"未找到{result.ProductionLine}对应配置巷道");
                    return content.Error($"未找到{result.ProductionLine}对应配置巷道");
                }   
            }
            else
            {
                strings = stationManagers.Roadway.Split(',').ToList();
            }
             

            return await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 1);
        }
@@ -1231,7 +1263,15 @@
            if (stockInfo.AreaCode.Contains("CH"))
            {
                // 创建并添加任务到数据库
                task = CreateTask(stockInfo, "1020-1", taskType);
                if(stockInfo.LocationInfo.RoadwayNo=="CHSC1"|| stockInfo.LocationInfo.RoadwayNo == "CHSC2"|| stockInfo.LocationInfo.RoadwayNo == "CHSC3")
                {
                    task = CreateTask(stockInfo, "1020-1", taskType);
                }
                else
                {
                    task = CreateTask(stockInfo, "1049-1", taskType);
                }
                
            }
            else
            {