新增历史信息，页面排序，生产时间

huanghongfeng

2024-12-09 19e5b7583a2aa1968c674b4b35f618cc6c2e29ef

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

@@ -20,6 +20,7 @@
using NetTaste;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System;
@@ -40,14 +41,15 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Utilities;
using WIDESEAWCS_DTO.Enum;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
using static Microsoft.IO.RecyclableMemoryStreamManager;

namespace WIDESEAWCS_TaskInfoService
{
@@ -86,6 +88,8 @@
        public string urlRelocationTaskCompleted = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlRelocationTaskCompleted"];
        public string urlQueryinventory = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlQueryinventory"];
        public string urlEmptyOutbound = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlEmptyOutbound"];
        public string urlRawmaterialout = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlRawmaterialout"];
        public string urlPalletQueryinventory = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlPalletQueryinventory"];
        /// <summary>
        /// æŽ¥æ”¶WMS任务信息
        /// </summary>
@@ -106,6 +110,7 @@
                    Dt_Task task = _mapper.Map<Dt_Task>(item);
                    task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                    task.CreateDate = DateTime.Now;
                    tasks.Add(task);
                }
                BaseDal.AddData(tasks);
@@ -134,6 +139,14 @@
            public string SourceAddress { get; set; }
            public string PalletCode { get; set; }
        }

        public class GenerateInv3
        {
            
            public string PalletCode { get; set; }
            public int outCount { get; set; }
            public string TargetAddress { get; set; }
        }
        public WebResponseContent RequestWMSTask(string palletCode, string sourceAddress)
        {
            WebResponseContent content = new WebResponseContent();
@@ -154,24 +167,15 @@
                        task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                        task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                        BaseDal.AddData(task);
                    }
                    else
                    {

                        return null;
                        return content = WebResponseContent.Instance.Error();
                    }
                }
                else
                {
                    return null;
                }
                
                return content = WebResponseContent.Instance.Error();
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
        /// è¿›è¡Œç»„盘
@@ -180,8 +184,38 @@
        /// <returns></returns>
        public WebResponseContent ToPlatform(string palletCode)
        {
            WebResponseContent content = new WebResponseContent();
            return  content = HttpHelper.Get<WebResponseContent>($"{urlQueryinventory}?palletCode={palletCode}");
            try
            {
                WebResponseContent content = new WebResponseContent();
                GenerateInv generate = new GenerateInv()
                {
                    SourceAddress = "",
                    PalletCode = palletCode
                };

                return content = HttpHelper.Post<WebResponseContent>($"{urlQueryinventory}", generate);
            }
            catch (Exception ex)
            {

                throw;
            }

            /*WebResponseContent content = new WebResponseContent();
            GenerateInv generate = new GenerateInv()
            {
                SourceAddress = "",
                PalletCode = palletCode
            };
            content = HttpHelper.Post<WebResponseContent>($"{urlQueryinventory}", generate);
            if (content != null)
            {
                if (content.Status)
                {
                    return content;
                }
            }
            return content = WebResponseContent.Instance.Error();*/
        }

        /// <summary>
@@ -190,34 +224,93 @@
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        public WebResponseContent RequestWMSTask2(string sourceAddress)
        public WebResponseContent RequestWMSTask2(string palletCode,string sourceAddress)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                content = HttpHelper.Get<WebResponseContent>($"{urlEmptyOutbound}?sourceAddress={sourceAddress}");
                GenerateInv generate = new GenerateInv()
                {
                    SourceAddress = sourceAddress,
                    PalletCode = palletCode
                };
                content = HttpHelper.Post<WebResponseContent>($"{urlEmptyOutbound}", generate);
                Dt_Task task = new Dt_Task();
                if (content != null)
                {
                    if (content.Status)
                    {
                        task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
                        task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                        task.TaskState = (int)TaskOutStatusEnum.OutNew;
                        task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
                        task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                        BaseDal.AddData(task);
                        return content = WebResponseContent.Instance.OK();
                    }
                    else
                    {

                        return content = WebResponseContent.Instance.Error();
                        WriteLog.GetLog("PLC日志出库日志").Write($"空托出库失败，详情：{content.Message}", "需要空托");
                    }
                }
                else
                {
                    return content = WebResponseContent.Instance.Error();
                }
                return content = WebResponseContent.Instance.Error();
            }
            catch (Exception ex)
            {
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
        }

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€èµ·å§‹åœ°å€å‘WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        public WebResponseContent RequestWMSTask3(string palletCode, int outCount,string Loc)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                if (outCount==0)
                {
                    outCount = 1;
                }
                GenerateInv3 generate = new GenerateInv3()
                {
                    PalletCode = palletCode,
                    outCount = outCount,
                    TargetAddress= Loc
                };
                content = HttpHelper.Post<WebResponseContent>($"{urlRawmaterialout}", generate);
                Dt_Task task = new Dt_Task();
                if (content != null)
                {
                    if (content.Status)
                    {
                        task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
                        task.TaskState = (int)TaskOutStatusEnum.OutNew;
                        task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
                        task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                        BaseDal.AddData(task);
                        return content = WebResponseContent.Instance.OK();
                    }
                }
                return content = WebResponseContent.Instance.Error();
            }
            catch (Exception ex)
            {
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
        }


        public WebResponseContent RequestWMSTask4()
        {
            WebResponseContent content = new WebResponseContent();
            try
            {

                return content = HttpHelper.Get<WebResponseContent>($"{urlPalletQueryinventory}");
            }
            catch (Exception ex)
            {
@@ -239,16 +332,25 @@
            {
                if (content.Status)
                {
                    if (Convert.ToInt32(content.Data) != _Task.TaskNum)
                    if(content.Data != null)
                    {
                        task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
                        task.TaskState = (int)TaskRelocationTypeEnum.Relocation;
                        task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                        task.Grade = 3;
                        BaseDal.AddData(task);
                        return task;
                    }
                        if (task.TaskNum != _Task.TaskNum)
                        {

                            task.TaskState = (int)TaskRelocationTypeEnum.Relocation;
                            task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                            task.TaskNum = task.TaskNum;
                            task.Grade = 3;
                            task.TaskType= (int)TaskRelocationTypeEnum.Relocation;
                            BaseDal.AddData(task);
                            return task;
                        }
                    }
                }
                else
                {
                    WriteLog.GetLog("PLC日志").Write($"失败信息：{content.Message}", "移库信息");
                }
            }

@@ -324,6 +426,20 @@
            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskState == (int)TaskInStatusEnum.SC_InExecuting);
        }

        public Dt_Task IngStackerCraneTask2(string deviceNo)
        {
            //string deviceNot = deviceNo == "SC01" ? "1" : "2";
            try
            {
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting);
            }
            catch (Exception ex)
            {

                throw;
            }
        }

        /// <summary>
        /// æ ¹æ®è®¾å¤‡ç¼–号、当前地址按照优先级以及创建时间排序查询任务池入库类型的新增的任务
        /// </summary>
@@ -371,7 +487,7 @@
        /// <returns>返回任务实体对象集合，可能为null</returns>
        public List<Dt_Task> QueryStationIsOccupiedOutTasks(string deviceNo, string SourceAddress)
        {
            return BaseDal.QueryData(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew && SourceAddress.Contains(x.SourceAddress), TaskOrderBy);
            return BaseDal.QueryData(x => x.Roadway == deviceNo && SourceAddress.Contains(x.SourceAddress), TaskOrderBy);
        }

        /// <summary>
@@ -571,6 +687,12 @@
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public class GenerateInv2
        {
            public string PalletCode { get; set; }
            public string SourceAddress { get; set; }
            public string TargetAddress { get; set; }
        }
        public WebResponseContent StackCraneTaskCompleted(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
@@ -609,7 +731,14 @@
                }
                else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                {
                    content = HttpHelper.Get<WebResponseContent>($"{urlRelocationTaskCompleted}?PalletCode={task.PalletCode}&SourceAddress ={ task.SourceAddress}TargetAddress ={task.TargetAddress}");
                    GenerateInv2 generate = new GenerateInv2()
                    {
                        PalletCode = task.PalletCode,
                        SourceAddress = task.SourceAddress,
                        TargetAddress = task.TargetAddress

                    };
                    content = HttpHelper.Post<WebResponseContent>($"{urlRelocationTaskCompleted}", generate);
                    task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
@@ -723,5 +852,63 @@
            }
            return content;
        }


        /// <summary>
        /// åˆ é™¤æ•°æ®
        /// </summary>
        /// <param name="keys">主键数组</param>
        /// <returns></returns>
        public virtual WebResponseContent DeleteData(object[] keys)
        {
            try
            {
                List<Dt_Task> tasks = BaseDal.QureyDataByIds(keys);
                foreach (Dt_Task task in tasks)
                {
                    _task_HtyService.AddTaskHty(task);
                }


                if (typeof(Dt_Task).GetNavigatePro() == null)
                    return BaseDal.DeleteDataByIds(keys) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
                else
                {
                    if (keys != null)
                    {
                        Type detailType = typeof(Dt_Task).GetDetailType();
                        string name = typeof(Dt_Task).GetMainIdByDetail();
                        List<object> dynamicDelKeys = new List<object>();

                        for (int i = 0; i < keys.Length; i++)
                        {
                            dynamicDelKeys.Add(keys[i]);
                        }
                        ((SqlSugarClient)BaseDal.Db).BeginTran();

                        if (dynamicDelKeys.Count > 0)
                            BaseDal.Db.Deleteable<object>().AS(detailType.Name).Where($"{name} in (@id)", new { id = dynamicDelKeys.ToArray() }).ExecuteCommandHasChange();

                        BaseDal.DeleteDataByIds(keys);

                        ((SqlSugarClient)BaseDal.Db).CommitTran();

                        return WebResponseContent.Instance.OK();
                    }
                    else
                    {
                        return WebResponseContent.Instance.Error("参数错误");
                    }
                }
            }
            catch (Exception ex)
            {
                ((SqlSugarClient)BaseDal.Db).RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

       

    }
}