1
dengjunjie
2026-02-26 8d88e4d037aa5b6ce032f0b71417baa2845bb5d6
1
已修改2个文件
14 ■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/KLSLocationInfoService.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/KLSLocationInfoService.cs
@@ -1,4 +1,5 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -21,7 +22,13 @@
        public KLSLocationInfoService(IRepository<Dt_KLSLocationInfo> BaseDal) : base(BaseDal)
        {
        }
        private Dictionary<string, OrderByType> _emptyAssignOrderBy = new Dictionary<string, OrderByType>()
        {
            { nameof(Dt_KLSLocationInfo.Depth), OrderByType.Desc },
            { nameof(Dt_KLSLocationInfo.Layer), OrderByType.Asc },
            { nameof(Dt_KLSLocationInfo.Column), OrderByType.Asc },
            { nameof(Dt_KLSLocationInfo.Row), OrderByType.Asc },
        };
        public IRepository<Dt_KLSLocationInfo> Repository => BaseDal;
        /// <summary>
        /// èŽ·å–å¯ç”¨ç©ºè´§ä½
@@ -31,7 +38,7 @@
        /// <returns></returns>
        public Dt_KLSLocationInfo GetFreeLocationInfo(string AreaCode, int containerType)
        {
            Dt_KLSLocationInfo? kLSLocationInfo = BaseDal.QueryFirst(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == containerType);
            Dt_KLSLocationInfo? kLSLocationInfo = BaseDal.QueryFirst(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == containerType,_emptyAssignOrderBy);
            return kLSLocationInfo;
        }
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs
@@ -77,8 +77,7 @@
                    };
                    gALAXISTaskInfo.tasks.Add(gALAXISTask);
                }
                Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GALAXISTaskInfo));
                if (apiInfo == null) throw new Exception("未找到凯乐士AGV任务下发接口配置信息!请检查接口配置");
                Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GALAXISTaskInfo)) ?? throw new Exception("未找到凯乐士AGV任务下发接口配置信息!请检查接口配置");
                string response = HttpHelper.Post(apiInfo.ApiAddress, gALAXISTaskInfo.Serialize());
                GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
                if (agvContent.success)