wanshenmean
2025-03-22 af9c3ed5d036ad68faf7e18f566679b3da92d244
合并
已修改42个文件
已添加1个文件
335 ■■■■■ 文件已修改
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Release/net6.0/WIDESEAWCS_IProcessService.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Release/net6.0/WIDESEAWCS_ProcessService.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs 201 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/LogLibrary/Log/Log.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/AgingInOrOutInput/AgingInOrOutInputService.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Debug/net6.0/WIDESEA_Tasks.csproj.FileListAbsolute.txt 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile3.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.exe 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.exe 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.exe 补丁 | 查看 | 原始文档 | blame | 历史
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Release/net6.0/WIDESEAWCS_IProcessService.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_IProcessService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f29f4bb2f2a98f090e56ad82ae11cf88f4c14fd")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_IProcessService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_IProcessService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Release/net6.0/WIDESEAWCS_ProcessService.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ProcessService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f29f4bb2f2a98f090e56ad82ae11cf88f4c14fd")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ProcessService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ProcessService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>E:\GIT\BaiBuSanlou\CodeManagement\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl>
    <History>True|2025-03-20T18:10:54.8314020Z;True|2025-03-18T16:25:46.4649995+08:00;True|2025-02-19T11:41:36.9348078+08:00;True|2025-02-18T18:28:41.9967285+08:00;True|2025-02-18T18:25:36.2264950+08:00;True|2025-02-18T10:30:56.5234743+08:00;True|2025-02-15T15:24:40.7310549+08:00;True|2025-02-15T14:26:13.5854743+08:00;True|2025-02-15T14:23:09.9103735+08:00;True|2025-02-15T14:11:58.0255348+08:00;True|2025-02-15T13:55:31.3438054+08:00;True|2025-02-15T13:47:31.3307267+08:00;True|2025-02-15T13:46:24.9001959+08:00;True|2025-02-15T13:23:47.4161644+08:00;True|2025-02-15T13:10:20.4988808+08:00;True|2025-02-15T13:05:10.7619905+08:00;True|2025-02-15T12:55:42.2397751+08:00;True|2025-02-15T12:43:42.1819119+08:00;True|2025-02-15T10:19:42.3871047+08:00;True|2025-01-03T16:15:25.4007394+08:00;True|2025-01-03T15:59:55.6586669+08:00;True|2025-01-03T15:58:54.7953589+08:00;True|2025-01-03T15:54:46.8938743+08:00;True|2025-01-03T15:30:32.7439557+08:00;True|2025-01-03T15:27:53.2337341+08:00;True|2025-01-03T15:24:30.7045349+08:00;True|2025-01-02T14:13:36.7820311+08:00;</History>
    <History>True|2025-03-21T15:34:47.6039521Z;True|2025-03-21T02:10:54.8314020+08:00;True|2025-03-18T16:25:46.4649995+08:00;True|2025-02-19T11:41:36.9348078+08:00;True|2025-02-18T18:28:41.9967285+08:00;True|2025-02-18T18:25:36.2264950+08:00;True|2025-02-18T10:30:56.5234743+08:00;True|2025-02-15T15:24:40.7310549+08:00;True|2025-02-15T14:26:13.5854743+08:00;True|2025-02-15T14:23:09.9103735+08:00;True|2025-02-15T14:11:58.0255348+08:00;True|2025-02-15T13:55:31.3438054+08:00;True|2025-02-15T13:47:31.3307267+08:00;True|2025-02-15T13:46:24.9001959+08:00;True|2025-02-15T13:23:47.4161644+08:00;True|2025-02-15T13:10:20.4988808+08:00;True|2025-02-15T13:05:10.7619905+08:00;True|2025-02-15T12:55:42.2397751+08:00;True|2025-02-15T12:43:42.1819119+08:00;True|2025-02-15T10:19:42.3871047+08:00;True|2025-01-03T16:15:25.4007394+08:00;True|2025-01-03T15:59:55.6586669+08:00;True|2025-01-03T15:58:54.7953589+08:00;True|2025-01-03T15:54:46.8938743+08:00;True|2025-01-03T15:30:32.7439557+08:00;True|2025-01-03T15:27:53.2337341+08:00;True|2025-01-03T15:24:30.7045349+08:00;True|2025-01-02T14:13:36.7820311+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
@@ -390,6 +390,7 @@
        public WebResponseContent ReceiveByWMSTask([NotNull] WMSTaskDTO taskDTO)
        {
            WebResponseContent content = new WebResponseContent();
            ConsoleHelper.WriteSuccessLine($"接收到任务,任务数据:{JsonConvert.SerializeObject(taskDTO, Formatting.Indented)}");
            try
            {
                if (BaseDal.QueryFirst(x => x.TaskNum == taskDTO.TaskNum || x.PalletCode == taskDTO.PalletCode) != null)
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -1,6 +1,5 @@
//using HslCommunication;
using HslCommunication;
using Mapster;
using Masuit.Tools;
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Newtonsoft.Json;
using System.Text.RegularExpressions;
@@ -283,18 +282,8 @@
        private async Task RequestWmsTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, Dt_StationManager stationManager)
        {
            string isTrue = string.Empty;
            ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
            ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
            if(result.SerialNos.Count == 0)
            {
                var Traycontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
                if (Traycontent.Status)
                {
                    ConsoleHelper.WriteSuccessLine("请求回流静置");
                    ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
                }
            }
            List<string> strings = stationManager.Roadway.Split(",").ToList();
            foreach (string item in strings)
@@ -515,161 +504,61 @@
                }
            }
        }
        /// <summary>
        /// æ‰§è¡Œè¾“送线任务
        /// </summary>
        /// <param name="conveyorLine">输送线对象</param>
        /// <param name="command">输送线任务命令</param>
        /// <param name="ProtocalDetailValue">协议明细值</param>
        /// <param name="childDeviceCode">子设备编号</param>
        //public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue, string childDeviceCode)
        //{
        //    var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
        //    if (task != null)
        //    {
        //        var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
        //        var valueList = value.Split(',').ToList();
        //        if (valueList.Contains(task.SourceAddress))
        //        {
        //            conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
        //            var log = $"【{conveyorLine._deviceName}】任务号:【{task.TaskNum}】,托盘条码:【{task.PalletCode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{1000}】";
        //            ConsoleHelper.WriteWarningLine(log);
        //            _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
        //            WriteInfo(conveyorLine.DeviceName, log);
        //            ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
        //        }
        //        else
        //        {
        //            if (task.Roadway.Contains("JZ"))
        //            {
        //                var outJZTask = _taskRepository.QueryData(x => x.Roadway== task.Roadway && x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting || x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting || x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish);
        //                if (outJZTask.IsNullOrEmpty())
        //                {
        //                    var next = task.NextAddress;
        //                    var taskCommand = MapTaskCommand(task, command);
        //                    task.NextAddress = next;
        //                    var log = $"【{conveyorLine._deviceName}】任务号:【{command.TaskNum}】,托盘条码:【{command.Barcode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{taskCommand.TargetAddress}】";
        //                    ConsoleHelper.WriteWarningLine(log);
        //                    _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
        //                    WriteInfo(conveyorLine.DeviceName, log);
        //                    conveyorLine.SendCommand(taskCommand, childDeviceCode);
        //                    ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
        //                    _taskService.UpdateTaskStatusToNext(task);
        //                }
        //                else
        //                {
        //                    ConsoleHelper.WriteWarningLine("已存在静置出库任务,静置入库任务无法下发线体");
        //                }
        //            }
        //            else
        //            {
        //                var next = task.NextAddress;
        //                var taskCommand = MapTaskCommand(task, command);
        //                task.NextAddress = next;
        //                var log = $"【{conveyorLine._deviceName}】任务号:【{command.TaskNum}】,托盘条码:【{command.Barcode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{taskCommand.TargetAddress}】";
        //                ConsoleHelper.WriteWarningLine(log);
        //                _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
        //                WriteInfo(conveyorLine.DeviceName, log);
        //                conveyorLine.SendCommand(taskCommand, childDeviceCode);
        //                ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
        //                _taskService.UpdateTaskStatusToNext(task);
        //            }
        //        }
        //    }
        //}
        /// <summary>
        /// æ‰§è¡Œè¾“送线任务
        /// </summary>
        /// <param name="conveyorLine">输送线对象</param>
        /// <param name="command">输送线任务命令</param>
        /// <param name="ProtocalDetailValue">协议明细值</param>
        /// <param name="childDeviceCode">子设备编号</param>
        public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue, string childDeviceCode)
        public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue ,string childDeviceCode)
        {
            // æŸ¥è¯¢ä»»åŠ¡ä¿¡æ¯
            var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
            if (task == null) return;
            // èŽ·å–é…ç½®å€¼å¹¶è½¬æ¢ä¸ºåˆ—è¡¨
            var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
            var valueList = value.Split(',').ToList();
            // æ—¥å¿—模板
            var logMessage = $"【{conveyorLine._deviceName}】任务号:【{task.TaskNum}】,托盘条码:【{task.PalletCode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{{0}}】";
            // åˆ¤æ–­ä»»åŠ¡çš„èµ·å§‹åœ°å€æ˜¯å¦åœ¨é…ç½®åˆ—è¡¨ä¸­
            if (valueList.Contains(task.SourceAddress))
            if (task != null)
            {
                // è®¾ç½®ç›®æ ‡åœ°å€ä¸º "1000"
                conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
                // è®°å½•日志并发送完成信号
                LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, "1000");
            }
            else if (task.Roadway.Contains("JZ"))
            {
                // æŸ¥è¯¢æ˜¯å¦å­˜åœ¨é™ç½®å‡ºåº“任务
                var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
                    (x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting ||
                     x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting ||
                     x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish));
                if (outJZTask.IsNullOrEmpty())
                var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
                var valueList = value.Split(',').ToList();
                if (valueList.Contains(task.SourceAddress))
                {
                    // æ˜ å°„任务命令
                    conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
                    var log = $"【{conveyorLine._deviceName}】任务号:【{task.TaskNum}】,托盘条码:【{task.PalletCode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{1000}】";
                    ConsoleHelper.WriteWarningLine(log);
                    _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
                    WriteInfo(conveyorLine.DeviceName, log);
                    ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                }
                else if (task.TargetAddress == "1020-1")
                {
                    var next = task.NextAddress;
                    var taskCommand = MapTaskCommand(task, command);
                    // è®°å½•日志并发送完成信号
                    LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, taskCommand.TargetAddress.ToString());
                    // å‘送任务命令
                    task.NextAddress = next;
                    var log = $"【{conveyorLine._deviceName}】任务号:【{command.TaskNum}】,托盘条码:【{command.Barcode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{taskCommand.TargetAddress}】";
                    ConsoleHelper.WriteWarningLine(log);
                    _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
                    WriteInfo(conveyorLine.DeviceName, log);
                    conveyorLine.SendCommand(taskCommand, childDeviceCode);
                    // æ›´æ–°ä»»åŠ¡çŠ¶æ€
                    _taskService.UpdateTaskStatusToNext(task);
                    ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                    var taskHty = task.Adapt<Dt_Task_Hty>();
                    _task_HtyRepository.AddData(taskHty);
                    _taskService.DeleteData(task);
                }
                else
                {
                    ConsoleHelper.WriteWarningLine("已存在静置出库任务,静置入库任务无法下发至线体");
                    var next = task.NextAddress;
                    var taskCommand = MapTaskCommand(task, command);
                    task.NextAddress = next;
                    var log = $"【{conveyorLine._deviceName}】任务号:【{command.TaskNum}】,托盘条码:【{command.Barcode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{taskCommand.TargetAddress}】";
                    ConsoleHelper.WriteWarningLine(log);
                    _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
                    WriteInfo(conveyorLine.DeviceName, log);
                    conveyorLine.SendCommand(taskCommand, childDeviceCode);
                    ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                    _taskService.UpdateTaskStatusToNext(task);
                }
            }
            else
            {
                // æ˜ å°„任务命令
                var taskCommand = MapTaskCommand(task, command);
                // è®°å½•日志并发送完成信号
                LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, taskCommand.TargetAddress.ToString());
                // å‘送任务命令
                conveyorLine.SendCommand(taskCommand, childDeviceCode);
                // æ›´æ–°ä»»åŠ¡çŠ¶æ€
                _taskService.UpdateTaskStatusToNext(task);
            }
        }
        /// <summary>
        /// è®°å½•日志并发送完成信号
        /// </summary>
        /// <param name="conveyorLine">输送线对象</param>
        /// <param name="childDeviceCode">子设备编号</param>
        /// <param name="ProtocalDetailValue">协议明细值</param>
        /// <param name="logMessage">日志消息模板</param>
        /// <param name="targetAddress">目标地址</param>
        private void LogAndSendFinish(CommonConveyorLine conveyorLine, string childDeviceCode, int ProtocalDetailValue, string logMessage, string targetAddress)
        {
            // æ ¼å¼åŒ–日志消息
            var log = string.Format(logMessage, targetAddress);
            // è¾“出警告日志
            ConsoleHelper.WriteWarningLine(log);
            // è®°å½•日志
            _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log, time = DateTime.Now.ToString("G"), color = "red" });
            WriteInfo(conveyorLine.DeviceName, log);
            // å‘送完成信号
            ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
        }
    }
}
CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2
Binary files differ
CodeManagement/WMS/WIDESEA_WMSServer/LogLibrary/Log/Log.cs
@@ -217,7 +217,7 @@
        public void Error(bool isWriteFile, object message)
        {
            string log = GetDataTimeLog(message.ToString());
            Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
            //Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
            if (isWriteFile)
            {
                LogUtil.WriteLogFile(m_Name, m_Error, log);
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_BusinessServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_BusinessServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_BusinessServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_BusinessesRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_BusinessesRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_BusinessesRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs
@@ -51,13 +51,16 @@
        var filteredParameters = parameters.Where(p => p.Key != "RequestTime"&& p.Key != "SessionId").ToDictionary(p => p.Key, p => p.Value);
        string requestKey = $"{url}:{JsonConvert.SerializeObject(filteredParameters)}";
        // æ£€æŸ¥è¯·æ±‚次数和时间限制
        // æ£€æŸ¥è¯·æ±‚次数和时间限制
        if (requestTracker.TryGetValue(requestKey, out var requestInfo))
        {
            if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(10))
            {
                // å¦‚果请求次数超过限制且未超过10分钟,抛出异常
                throw new InvalidOperationException("请求次数已达到限制,请稍后再试。");
                Console.WriteLine("请求次数已达到限制,请稍后再试。");
                Console.WriteLine($"接口地址:{url}");
                Console.WriteLine($"请求数据:{JsonConvert.SerializeObject(filteredParameters, Formatting.Indented)}");
                throw new Exception($"接口地址:{url}---请求次数已达到限制,请稍后再试。");
            }
        }
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_DTO")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_DTO")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_DTO")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IBusinessServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IBusinessServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IBusinessServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IBusinessesRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IBusinessesRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IBusinessesRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStoragIntegrationServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStoragIntegrationServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStoragIntegrationServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStorageBasicRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStorageBasicRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStorageBasicRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStorageBasicServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStorageBasicServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStorageBasicServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStorageOutOrderRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStorageOutOrderRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStorageOutOrderRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStorageOutOrderServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStorageOutOrderServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStorageOutOrderServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStorageTaskRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStorageTaskRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStorageTaskRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStorageTaskServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStorageTaskServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStorageTaskServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_Services")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_Services")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_Services")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/AgingInOrOutInput/AgingInOrOutInputService.cs
@@ -45,8 +45,7 @@
            }
            var wmsIpAddress = wmsBase + ipAddress;
            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            content.OK(data: result);
            var result = await HttpsClient.PostAsync(wmsIpAddress, inputJson);
            var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.ToString());
            if (!respone.Success)
@@ -61,6 +60,7 @@
            LogFactory.GetLog("静置陈化入库(整托盘)").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化入库(整托盘)").Info(true, input.TrayBarcode);
            LogFactory.GetLog("静置陈化入库(整托盘)").Info(true, result);
            content.OK(data: result);
        }
        catch (Exception err)
        {
@@ -68,6 +68,7 @@
            //Console.WriteLine(err.Message.ToString());
            LogFactory.GetLog("静置陈化入库(整托盘)").Error(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化入库(整托盘)").Error(true, err.StackTrace);
            content.Error(err.Message);
        }
        return content;
    }
@@ -95,7 +96,7 @@
            }
            var wmsIpAddress = wmsBase + ipAddress;
            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            var result = await HttpsClient.PostAsync(wmsIpAddress, inputJson);
            var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.ToString());
            if (!respone.Success)
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs
@@ -92,7 +92,7 @@
            }
            var wmsIpAddress = wmsBase + ipAddress;
            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            var result = await HttpsClient.PostAsync(wmsIpAddress, inputJson);
            var respone = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result.ToString());
@@ -118,6 +118,7 @@
            LogFactory.GetLog("整盘电芯属性获取").Error(true, $"请求参数: {JsonConvert.SerializeObject(input)}");
            LogFactory.GetLog("整盘电芯属性获取").Error(true, err.Message);
            LogFactory.GetLog("整盘电芯属性获取").Error(true, err.StackTrace);
            content.Error(err.Message);
        }
        return content;
    }
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs
@@ -57,21 +57,11 @@
            }
            var wmsIpAddress = wmsBase + ipAddress;
            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            var result = await HttpsClient.PostAsync(wmsIpAddress, inputJson);
            if (result != null)
            {
                content.OK(data: result);
                //var respone = JsonConvert.DeserializeObject<ResultProcessApply>(result.ToString());
                //if (!respone.Success)
                //{
                //    MoMErrorMsg.AddMoMErrorMsg(0, input.WipOrderNo, respone.MOMMessage, SysConfigConst.TrayCellsStatus);
                //}
                //else
                //{
                //    MoMErrorMsg.DeleteMoMErrorMsg(0, input.WipOrderNo);
                //}
            }
            LogFactory.GetLog("工艺路线申请").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("工艺路线申请").Info(true, result);
@@ -81,6 +71,7 @@
            //Console.WriteLine(ex.Message);
            LogFactory.GetLog("工艺路线申请").Error(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("工艺路线申请").Error(true, ex.StackTrace);
            content.Error(ex.Message);
        }
        return content;
    }
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StoragIntegrationServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StoragIntegrationServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StoragIntegrationServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StorageBasicRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StorageBasicRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StorageBasicRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StorageBasicServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StorageBasicServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StorageBasicServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StorageOutOrderRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StorageOutOrderRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StorageOutOrderRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StorageOutOrderServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StorageOutOrderServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StorageOutOrderServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StorageTaskRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StorageTaskRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StorageTaskRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -612,30 +612,6 @@
        try
        {
            Dt_Task taskNews = new Dt_Task
            {
                CurrentAddress = input.Position,
                Grade = 1,
                Roadway = "CWSC1",
                TargetAddress = "CWSC1",
                Dispatchertime = DateTime.Now,
                MaterialNo = "",
                NextAddress = "CWSC1",
                OrderNo = null,
                PalletCode = input.PalletCode,
                SourceAddress = input.Position,
                TaskState = (int)TaskInStatusEnum.InNew,
                TaskType = (int)TaskInboundTypeEnum.InTray,
                TaskNum = await BaseDal.GetTaskNo(),
                Creater = "Systeam",
                ProductionLine = input.ProductionLine,
                //ProcessCode = processCode
            };
            var taskDTOs = CreateTaskDTO(taskNews);
            BaseDal.AddData(taskNews);
            return content.OK(data: taskDTOs);
            // æŸ¥è¯¢ä»»åŠ¡
            var task = await QueryTaskByPalletCode(input.PalletCode);
            if (task != null)
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -562,6 +562,12 @@
                Creater = "System",
                ProductionLine = stockInfo.ProductionLine,
            };
            var location = _locationRepository.QueryFirst(x => x.Id == stockInfo.LocationId);
            if (location == null) return null;
            location.LocationStatus = (int)LocationEnum.InStockDisable;
            _locationRepository.UpdateData(location);
            return task;
        }
        catch (Exception ex)
@@ -609,7 +615,7 @@
    {
        try
        {
            //if (stationManager.stationType == 15) throw new Exception("");
            if (stationManager.stationType != 15) throw new Exception("");
            // åˆ›å»ºä¸€ä¸ªTrayCellsStatusDto对象,并赋值
            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StorageTaskServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f29f4bb2f2a98f090e56ad82ae11cf88f4c14fd")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e9b4a4107bdd7a7c737192827d4ee17e23c362f6")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StorageTaskServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StorageTaskServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Debug/net6.0/WIDESEA_Tasks.csproj.FileListAbsolute.txt
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\bin\Debug\net6.0\WIDESEA_Tasks.deps.json
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\bin\Debug\net6.0\WIDESEA_Tasks.dll
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\bin\Debug\net6.0\WIDESEA_Tasks.pdb
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\WIDESEA_Tasks.GeneratedMSBuildEditorConfig.editorconfig
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\WIDESEA_Tasks.AssemblyInfoInputs.cache
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\WIDESEA_Tasks.AssemblyInfo.cs
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\WIDESEA_Tasks.csproj.CoreCompileInputs.cache
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\WIDESEA_Tasks.dll
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\refint\WIDESEA_Tasks.dll
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\WIDESEA_Tasks.pdb
E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_Tasks\obj\Debug\net6.0\ref\WIDESEA_Tasks.dll
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile3.pubxml.user
@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>E:\GIT\BaiBuSanlou\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_WMSServer\bin\Release\net6.0\publish\</_PublishTargetUrl>
    <History>True|2025-03-21T04:03:22.7993576Z;True|2025-03-21T02:10:38.6772689+08:00;</History>
    <History>True|2025-03-21T09:34:20.4988193Z;True|2025-03-21T17:20:47.4546962+08:00;True|2025-03-21T15:16:14.5782768+08:00;True|2025-03-21T12:03:22.7993576+08:00;True|2025-03-21T02:10:38.6772689+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.exe
Binary files differ
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.exe
Binary files differ
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.exe
Binary files differ