优化

yanjinhui

2026-03-02 fe6e4884fc9316df52e1180146891c5498f364f4

优化

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSReturnMethod.cs

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

namespace WIDESEAWCS_DTO.WMS
{
    public class WMSReturnMethod
    {

        public static WMSReturn ReturnWMS(WebResponseContent content, int successCode = 0, int failCode = 404)
        {
            return new WMSReturn
            {
                code = content.Status ? successCode : failCode,
                msg = content.Message ?? (content.Status ? "操作成功" : "操作失败"),
                data = content.Status ? content.Data : null
            };
        }
    }
}

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs

@@ -23,15 +23,7 @@
        }


        public WMSReturn ReturnWMS(WebResponseContent content, int successCode = 0, int failCode = 404)
        {
            return new WMSReturn
            {
                code = content.Status ? successCode : failCode,
                msg = content.Message ?? (content.Status ? "操作成功" : "操作失败"),
                data = content.Status ? content.Data : null
            };
        }
     


        /// <summary>
@@ -43,7 +35,7 @@
        public WMSReturn ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
        {
            WebResponseContent content = _taskService.ReceiveWMSTask(taskDTOs);
            return ReturnWMS(content);
            return WMSReturnMethod.ReturnWMS(content);
        }

        /// <summary>
@@ -55,7 +47,7 @@
        public WMSReturn CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
        {
            WebResponseContent content = _taskService.CancelWMSTask(wMSCancelTask);
            return ReturnWMS(content);
            return WMSReturnMethod.ReturnWMS(content);
        }

        /// <summary>
@@ -67,7 +59,7 @@
        public WMSReturn UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
        {
            WebResponseContent content = _taskService.UpdateWMSTaskPriority(updateTaskPriority);
            return ReturnWMS(content);
            return WMSReturnMethod.ReturnWMS(content);
        }

        /// <summary>
@@ -79,7 +71,7 @@
        public WMSReturn ModifyWMSLayoutZone([FromBody] WMSUpdateLocationArea wMSUpdateLocationArea)
        {
            WebResponseContent content = _taskService.ModifyWMSLayoutZone(wMSUpdateLocationArea);
            return ReturnWMS(content);
            return WMSReturnMethod.ReturnWMS(content);
        }

        /// <summary>
@@ -91,7 +83,7 @@
        public WMSReturn LocationInquiry(string AreaCode)
        {
            WebResponseContent content = _taskService.LocationInquiry(AreaCode);
            return ReturnWMS(content);
            return WMSReturnMethod.ReturnWMS(content);
        }
    }
}

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

@@ -39,7 +39,7 @@
            {
                if (deviceTypeEnum == DeviceTypeEnum.GALAXIS)
                {
                    //GALAXISUpdateTaskStatus? gALAXIS = TaskDTO.Serialize().DeserializeObject<GALAXISUpdateTaskStatus>();
                     gALAXIS = TaskDTO.Serialize().DeserializeObject<GALAXISUpdateTaskStatus>();
                    if (gALAXIS == null) throw new Exception("参数转换失败！");
                    var task = BaseDal.QueryFirst(x => x.WMSTaskNum == gALAXIS.taskId);
                    if (task == null) throw new Exception($"未找到任务,任务编号【{gALAXIS.taskId}】");
@@ -65,11 +65,12 @@
                {

                }
                return WebResponseContent.Instance.OK();
                //return WebResponseContent.Instance.OK();
               return content.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
                return content.Error(ex.Message);
            }
            finally
            {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs

@@ -30,7 +30,7 @@
                    GALAXISTask gALAXISTask = new GALAXISTask()
                    {
                        taskId = task.WMSTaskNum,
                        taskType = task.TaskType == (int)TaskTypeEnum.MLInbound ? 0 : 1,
                        taskType = task.TaskType == (int)TaskTypeEnum.MLInbound ? 2 : 1,
                        barCode = task.PalletCode,
                        endNode = task.TargetAddress,
                        startNode = task.SourceAddress,