暂存

wanshenmean

2024-11-07 3106b64087cf6199b5a35aafb0eb583676017aa6

暂存

 .gitignore

@@ -974,3 +974,4 @@
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Debug/net6.0/WIDESEAWCS_ProcessRepository.csproj.CoreCompileInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache
*.txt
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache

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

@@ -41,8 +41,11 @@
                    using HttpClient httpClient = new HttpClient();
                    httpClient.Timeout = new TimeSpan(0, 0, 60);

                    foreach (var header in headers)
                        httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
                    if(headers != null)
                    {
                        foreach (var header in headers)
                            httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
                    }

                    result = await httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync();
                }

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MOM/RequestEqptRunDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace WIDESEAWCS_DTO.MOM
{
    public class RequestEqptRunDto : BasicDto
    {
        /// <summary>
        /// äººå‘˜å¯†ç 
        /// </summary>
        public string Password { get; set; }

        /// <summary>
        /// è®¾å¤‡æ¨¡å¼
        /// </summary>
        public string EquipmentModel { get; set; }
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -419,46 +419,46 @@

                    if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
                    {
                        if (task.Roadway.Contains("CH"))
                        {
                            Random random = new Random();
                            task.CurrentAddress = task.NextAddress;
                            task.NextAddress = $"{random.Next(1, 1).ToString().PadLeft(3, '0')}-{random.Next(0, 0).ToString().PadLeft(3, '0')}-{random.Next(1, 1).ToString().PadLeft(3, '0')}";
                            task.TargetAddress = task.NextAddress;
                        }
                        else
                        {
                            Random random = new Random();
                            task.CurrentAddress = task.NextAddress;
                            task.NextAddress = "002-020-001";
                            task.TargetAddress = task.NextAddress;
                        }
                        //if (task.Roadway.Contains("CH"))
                        //{
                        //    Random random = new Random();
                        //    task.CurrentAddress = task.NextAddress;
                        //    task.NextAddress = $"{random.Next(1, 1).ToString().PadLeft(3, '0')}-{random.Next(0, 0).ToString().PadLeft(3, '0')}-{random.Next(1, 1).ToString().PadLeft(3, '0')}";
                        //    task.TargetAddress = task.NextAddress;
                        //}
                        //else
                        //{
                        //    Random random = new Random();
                        //    task.CurrentAddress = task.NextAddress;
                        //    task.NextAddress = "002-020-001";
                        //    task.TargetAddress = task.NextAddress;
                        //}

                        #region çœŸå®žæ•°æ®
                        // TODO: è°ƒç”¨æŽ¥å£èŽ·å–下一个地址
                        //// åˆ›å»ºè¯·æ±‚对象
                        //RequestTaskDto request = new RequestTaskDto()
                        //{
                        //    Position = task.NextAddress,
                        //    PalletCode = task.PalletCode,
                        //};
                        // åˆ›å»ºè¯·æ±‚对象
                        RequestTaskDto request = new RequestTaskDto()
                        {
                            Position = task.NextAddress,
                            PalletCode = task.PalletCode,
                        };

                        //// å‘送请求并等待响应
                        //var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result;
                        // å‘送请求并等待响应
                        var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result;

                        //// ååºåˆ—化响应内容
                        //content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                        // ååºåˆ—化响应内容
                        content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                        //// æ£€æŸ¥çŠ¶æ€å¹¶è¿”回
                        //if (!content.Status)
                        //    return content;
                        // æ£€æŸ¥çŠ¶æ€å¹¶è¿”回
                        if (!content.Status)
                            return content;

                        //// ååºåˆ—化任务数据
                        //WMSTaskDTO taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
                        // ååºåˆ—化任务数据
                        WMSTaskDTO taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

                        //task.CurrentAddress = task.NextAddress;
                        //task.NextAddress = taskResult.TargetAddress;
                        //task.TargetAddress = task.NextAddress;
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = taskResult.TargetAddress;
                        task.TargetAddress = task.NextAddress;
                        #endregion

                    }
@@ -565,24 +565,12 @@
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库完成");


                    //var x = new { taskNum = taskNum };
                    //var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
                    //content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                    #region WMS同步任务完成
                    var x = new { taskNum = taskNum };
                    var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
                    content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                    #endregion

                    //WMSTaskDTO taskDTO = new WMSTaskDTO()
                    //{
                    //    TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
                    //    Grade = 1,
                    //    PalletCode = task.PalletCode + "S",
                    //    RoadWay = "SC01",
                    //    SourceAddress = task.TargetAddress,
                    //    TargetAddress = "CLOutAreaA",
                    //    TaskState = (int)TaskOutStatusEnum.OutNew,
                    //    Id = 0,
                    //    TaskType = (int)TaskOutboundTypeEnum.Outbound
                    //};

                    //content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                {

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

@@ -183,7 +183,7 @@
            HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);

            // å¦‚果没有出库任务，处理新任务
            if (task == null)
            if (task == null && command.Barcode != "NoRead")
            {
                HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
            }

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs

@@ -35,7 +35,7 @@
            bool isOutboundAndOutFinish = taskOut.TaskType == (int)TaskOutboundTypeEnum.Outbound && taskOut.TaskState == (int)TaskOutStatusEnum.SC_OutFinish;
            bool isOutboundAndLineOutExecuting = taskOut.TaskType == (int)TaskOutboundTypeEnum.Outbound && taskOut.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting;

            if (isOutTray || isOutboundAndOutFinish || !isOutboundAndLineOutExecuting)
            if (isOutTray || isOutboundAndOutFinish || isOutboundAndLineOutExecuting)
            {
                // å‘送命令到输送线
                conveyorLine.SendCommand(taskCommand, childDeviceCode);
@@ -44,7 +44,7 @@
                // æ›´æ–°ä»»åŠ¡çŠ¶æ€
                _taskService.UpdateTaskStatusToNext(taskOut);
            }
            else if (taskOut.TaskType == (int)TaskOutboundTypeEnum.Outbound && taskOut.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
            else if (taskOut.TaskType == (int)TaskOutboundTypeEnum.OutTray && taskOut.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
            {
                // å®ŒæˆWMS任务
                CompleteWmsTask(taskOut, command, conveyorLine, childDeviceCode, ProtocalDetailValue);

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -309,28 +309,30 @@
        {
            if (!commonStackerCrane.StackerOnline)
            {
                BasicDto dto = new BasicDto
                RequestEqptRunDto request = new RequestEqptRunDto()
                {
                    EmployeeNo = "T00001",
                    EquipmentCode = commonStackerCrane.DeviceCode,
                    RequestTime = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
                    SessionId = Guid.NewGuid().ToString(),
                    Software = commonStackerCrane.DeviceName,
                    Password = "12345",
                    EquipmentModel = "1"
                };
                var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptRun", dto.ToJsonString());
                var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptRun", request.ToJsonString());
                if (respone != null)
                {
                    var result = JsonConvert.DeserializeObject<ResponseEqptRunDto>(respone);
                    if (result != null && result.Success)
                    {
                        var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceName).FirstOrDefault();
                        var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceCode).FirstOrDefault();
                        if (process == null)
                        {
                            ResponeRunDto runDto = JsonConvert.DeserializeObject<ResponeRunDto>(respone);
                            process = new Dt_EquipmentProcess()
                            {
                                EquipmentName = commonStackerCrane.DeviceCode,
                                EquipmentType = commonStackerCrane.DeviceName.Substring(commonStackerCrane.DeviceCode.IndexOf("堆垛机")),
                                EquipmentType = new string(commonStackerCrane.DeviceName.TakeWhile(c => !char.IsDigit(c)).ToArray()),
                                WipOrderNo = runDto.WipOrderNo,
                                ProductDesc = runDto.ProductDesc,
                                ProcessValue = JsonConvert.SerializeObject(result)

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResultTrayCellsStatus.cs

@@ -12,11 +12,7 @@
        /// </summary>
        public List<SerialNoDto> SerialNos { get; set; } = new List<SerialNoDto>();

        /// <summary>
        /// ç»‘定代码
        /// </summary>
        public string BindCode { get; set; }

        public string TrayStatus { get; set; }
        /// <summary>
        /// æ–™æ¡†å±žæ€§åˆ—表
        /// </summary>
@@ -38,6 +34,8 @@
        /// </summary>
        public int PositionNo { get; set; }

        public string BindCode { get; set; }

        /// <summary>
        /// ç”µèŠ¯çŠ¶æ€
        /// </summary>
@@ -57,11 +55,30 @@
        /// <summary>
        /// å·¥åº
        /// </summary>
        public string ProcessCode { get; set; }
        public List<ProcessCodes> ProcessCodes { get; set; } = new List<ProcessCodes>();

        public double Capacity { get; set; }


        /// <summary>
        /// é€‚用物料编码/工艺型号
        /// </summary>
        public List<ProductTypes> ProductType { get; set; } = new List<ProductTypes>();
    }

    public class ProcessCodes
    {

        /// <summary>
        /// å·¥åº
        /// </summary>
        public string ProcessCode { get; set; }
    }

    public class ProductTypes
    {

        public string ProductType { get; set; }

    }
}

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

@@ -659,7 +659,7 @@
                SerialNumber = serialNoObj.SerialNo,
                OrderNo = serialNoObj.PositionNo.ToString(),
                Status = serialNoObj.SerialNoStatus,
                MaterielCode = result.BindCode,
                MaterielCode = serialNoObj.BindCode,
                Remark = result.TrayBarcodePropertys.ToJsonString(),
            }).ToList()
        };