11
yanjinhui
2026-03-22 1ffa551c6deb1fc3a4c5a9af168e7bade6b2f329
11
已添加1个文件
已修改3个文件
229 ■■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationInfo.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs 199 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationInfo.cs
@@ -24,6 +24,12 @@
        public string StationCode { get; set; }
        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "托盘编号")]
        public string PalletCode { get; set; }
        /// <summary>
        /// ç«™å°åç§°
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "站台名称")]
@@ -39,6 +45,12 @@
        public int StationType {  get; set; }
        /// <summary>
        /// ç«™å°çŠ¶æ€
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "站台状态")]
        public int StationStatus {  get; set; }
        /// <summary>
        /// æ‰€åœ¨æ¥¼å±‚,AA是1楼,BB是2楼,CC是3楼,DD是4楼,EE是5楼,FF是6楼
        /// </summary>
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "所在楼层")]
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs
@@ -417,6 +417,20 @@
                        dt_HKLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
                        _hKLocationInfoService.Repository.UpdateData(dt_HKLocationInfo);
                    }
                    Dt_StationInfo? stationInfo = _stationInfo.Repository.QueryFirst(x => x.StationCode == locationCode);
                    if (stationInfo != null)
                    {
                        if (locationStatusEnum == LocationStatusEnum.Free) //如果起点完成就给货位赋值托盘号
                        {
                            stationInfo.PalletCode = "";
                        }
                        else
                        {
                            stationInfo.PalletCode = palletCode;
                        }
                        stationInfo.StationStatus = locationStatusEnum.ObjToInt();
                        _stationInfo.UpdateData(stationInfo);
                    }
                }
                else if (deviceTypeEnum == DeviceTypeEnum.YuanLiJuHe)
                {
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -55,6 +55,7 @@
        private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
        private readonly IApiInfoService _apiInfoService;
        private readonly IStationMangerService _stationMangerService;
        private readonly IStationInfoService _stationInfo;
        private readonly IMapper _mapper;
        private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -74,7 +75,7 @@
        /// </summary>
        public IRepository<Dt_Task> Repository => BaseDal;
        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService) : base(BaseDal)
        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService, IStationInfoService stationInfo) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -86,6 +87,7 @@
            _apiInfoService = apiInfoService;
            _trackloginfoService = trackloginfoService;
            _stationMangerService = stationMangerService;
            _stationInfo = stationInfo;
        }
        public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
        {
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,199 @@
using Quartz;
using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
namespace WIDESEAWCS_Tasks
{
    public partial class ScheduledTaskJob : JobBase, IJob
    {
        private readonly ITaskService _taskService;
        private readonly IHKLocationInfoService _HKLocationInfoService;
        private readonly IStationInfoService _StationInfoService;
        private readonly IStationMangerService _stationMangerService;
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        public ScheduledTaskJob(ITaskService taskService, IApiInfoService apiInfoService, IHKLocationInfoService hKLocationInfoService, IStationInfoService stationInfoService, IStationMangerService stationMangerService, IUnitOfWorkManage unitOfWorkManage)
        {
            _taskService = taskService;
            _HKLocationInfoService = hKLocationInfoService;
            _StationInfoService = stationInfoService;
            _stationMangerService = stationMangerService;
            _unitOfWorkManage = unitOfWorkManage;
        }
        public Task Execute(IJobExecutionContext context)
        {
            try
            {
                #region ä¸‰æ¥¼è‡ªåŠ¨ä»»åŠ¡
                List<string> StationCodes = new() { "0321935CC0329515", "0321935CC0329015", "0321935CC0328485", "0321935CC0328005" };
                var stations = _StationInfoService.Repository.QueryData(x => StationCodes.Contains(x.StationCode));
                #region å…¥æå‡æœºä»»åŠ¡
                var station = stations.FirstOrDefault(x => x.StationStatus == (int)LocationStatusEnum.InStock);
                if (station != null)
                {
                    var tasknum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
                    Dt_Task dt_Task = new Dt_Task()
                    {
                        TaskNum = tasknum,
                        WMSTaskNum = "GP" + tasknum,
                        Grade = 60,
                        PalletCode = station.PalletCode,
                        Roadway = "",
                        TaskState = (int)TaskStatusEnum.New,
                        TaskType = TaskTypeEnum.RK3F.ObjToInt(),
                        SourceAddress = station.StationCode,
                        CurrentAddress = station.StationCode,
                        NextAddress = "TSJR3F",
                        TargetAddress = "TSJR3F",
                        Creater = "WCS",
                    };
                    var content = _taskService.SendHIKROBOTTask(dt_Task);
                    if (content.Status)
                    {
                        dt_Task.TaskState = (int)TaskStatusEnum.Execut;
                        dt_Task.Dispatchertime = DateTime.Now;
                        station.StationStatus = (int)LocationStatusEnum.OutLock;
                        _taskService.AddData(dt_Task);
                        _StationInfoService.UpdateData(station);
                    }
                }
                #endregion
                #region å‡ºæå‡æœºä»»åŠ¡
                var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                if (device != null && device.IsConnected)
                {
                    if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJC3F") == 1)
                    {
                        station = stations.FirstOrDefault(x => x.StationStatus == (int)LocationStatusEnum.Free);
                        if (station != null)
                        {
                            var tasknum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
                            Dt_Task dt_Task = new Dt_Task()
                            {
                                TaskNum = tasknum,
                                WMSTaskNum = "GP" + tasknum,
                                Grade = 60,
                                PalletCode = station.PalletCode,
                                Roadway = "",
                                TaskState = (int)TaskStatusEnum.New,
                                TaskType = TaskTypeEnum.CK3F.ObjToInt(),
                                SourceAddress = "TSJC3F",
                                CurrentAddress = "TSJC3F",
                                NextAddress = station.StationCode,
                                TargetAddress = station.StationCode,
                                Creater = "WCS",
                            };
                            var content = _taskService.SendHIKROBOTTask(dt_Task);
                            if (content.Status)
                            {
                                dt_Task.TaskState = (int)TaskStatusEnum.Execut;
                                dt_Task.Dispatchertime = DateTime.Now;
                                station.StationStatus = (int)LocationStatusEnum.InLock;
                                _taskService.AddData(dt_Task);
                                _StationInfoService.UpdateData(station);
                            }
                        }
                    }
                }
                #endregion
                #endregion
                #region å››æ¥¼è‡ªåŠ¨ä»»åŠ¡
                List<string> LocationCodes = new() { "RGD0304A04011", "RG0105A04031", "RG0202A05021" };
                var hKLocationInfos = _HKLocationInfoService.Repository.QueryData(x => LocationCodes.Contains(x.LocationCode));
                #region å…¥æå‡æœºä»»åŠ¡
                var hKLocation = hKLocationInfos.FirstOrDefault(x => x.LocationStatus == (int)LocationStatusEnum.InStock);
                if (hKLocation != null)
                {
                    var tasknum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
                    Dt_Task dt_Task = new Dt_Task()
                    {
                        TaskNum = tasknum,
                        WMSTaskNum = "GP" + tasknum,
                        Grade = 60,
                        PalletCode = hKLocation.PalletCode,
                        Roadway = "",
                        TaskState = (int)TaskStatusEnum.New,
                        TaskType = TaskTypeEnum.CHUKU1.ObjToInt(),
                        SourceAddress = hKLocation.LocationCode,
                        CurrentAddress = hKLocation.LocationCode,
                        NextAddress = "TSJR4F",
                        TargetAddress = "TSJR4F",
                        Creater = "WCS",
                    };
                    var content = _taskService.SendHIKROBOTTask(dt_Task);
                    if (content.Status)
                    {
                        dt_Task.TaskState = (int)TaskStatusEnum.Execut;
                        dt_Task.Dispatchertime = DateTime.Now;
                        hKLocation.LocationStatus = (int)LocationStatusEnum.OutLock;
                        _taskService.AddData(dt_Task);
                        _HKLocationInfoService.UpdateData(hKLocation);
                    }
                }
                #endregion
                #region å‡ºæå‡æœºä»»åŠ¡
                if (device != null && device.IsConnected)
                {
                    if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, "TSJC3F") == 1)
                    {
                        hKLocation = hKLocationInfos.FirstOrDefault(x => x.LocationStatus == (int)LocationStatusEnum.Free);
                        if (hKLocation != null)
                        {
                            var tasknum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
                            Dt_Task dt_Task = new Dt_Task()
                            {
                                TaskNum = tasknum,
                                WMSTaskNum = "GP" + tasknum,
                                Grade = 60,
                                PalletCode = hKLocation.PalletCode,
                                Roadway = "",
                                TaskState = (int)TaskStatusEnum.New,
                                TaskType = TaskTypeEnum.Q1TSJ4.ObjToInt(),
                                SourceAddress = "TSJC4F",
                                CurrentAddress = "TSJC4F",
                                NextAddress = hKLocation.LocationCode,
                                TargetAddress = hKLocation.LocationCode,
                                Creater = "WCS",
                            };
                            var content = _taskService.SendHIKROBOTTask(dt_Task);
                            if (content.Status)
                            {
                                dt_Task.TaskState = (int)TaskStatusEnum.Execut;
                                dt_Task.Dispatchertime = DateTime.Now;
                                hKLocation.LocationStatus = (int)LocationStatusEnum.InLock;
                                _taskService.AddData(dt_Task);
                                _HKLocationInfoService.UpdateData(hKLocation);
                            }
                        }
                    }
                }
                #endregion
                #endregion
            }
            catch (Exception ex)
            {
                Console.Out.WriteLine(nameof(TaskJob) + ":" + ex.Message);
            }
            return Task.CompletedTask;
        }
    }
}