增加出库单历史 库存历史查询功能

duyongjia

2024-12-28 6be2bc8324ca81145830b758c110255d9dfdc00b

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -4,10 +4,14 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.Http;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -21,7 +25,7 @@
namespace WIDESEAWCS_Tasks
{
    [DisallowConcurrentExecution]
    public class CommonStackerCraneJob : IJob
    public class CommonStackerCraneJob :JobBase, IJob
    {
        private readonly ITaskService _taskService;
        private readonly ITaskExecuteDetailService _taskExecuteDetailService;
@@ -35,23 +39,23 @@
            _taskRepository = taskRepository;
            _routerService = routerService;
        }

        public string url = AppSettings.Configuration["WMS"];
        public Task Execute(IJobExecutionContext context)
        {
            CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
            try
            {
                
                CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
            {               
                //CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
                if (commonStackerCrane != null)
                {
                    if (!commonStackerCrane.IsEventSubscribed)
                    {
                        commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//订阅任务完成事件
                    }
                    //if (!commonStackerCrane.IsEventSubscribed)
                    //{
                    //    commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//订阅任务完成事件
                    //}

                    if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal)
                    {
                        commonStackerCrane.CheckStackerCraneTaskCompleted();//防止任务完成事件监测超时，再手动触发一次
                        //commonStackerCrane.CheckStackerCraneTaskCompleted();//防止任务完成事件监测超时，再手动触发一次

                        if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
                        {
@@ -60,7 +64,7 @@
                            {
                                StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
                                int isIn = commonStackerCrane.Communicator.Read<byte>("DB106.12.0");
                                if(task.TaskType == (int)TaskOutboundTypeEnum.Outbound&&isIn==1)//如果在入库中，不允计下发出库任务
                                if((task.TaskType == (int)TaskOutboundTypeEnum.Outbound|| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory) &&isIn==1)//如果在入库中，不允计下发出库任务
                                {
                                  return Task.CompletedTask;
                                }
@@ -69,15 +73,17 @@
                                    bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
                                    if (sendFlag)
                                    {
                                        if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                                        if (task.TaskType == (int)TaskInboundTypeEnum.Inbound|| task.TaskType == (int)TaskInboundTypeEnum.InInventory||task.TaskType==(int)TaskInboundTypeEnum.InPick)
                                        {
                                            _taskService.UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InExecuting);
                                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库执行中");
                                            var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                                        }
                                        else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                                        else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound|| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                                        {
                                            _taskService.UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutExecuting);
                                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库执行中");
                                            var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                                        }
                                    }
                                }
@@ -90,6 +96,29 @@
            {
                Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
            }

            if (commonStackerCrane != null)
            {
                //读取大堆垛机任务号和任务完成确认状态（因为封装的事件经常不触发，所以加个直接读的逻辑，以免出现堆垛机一直接处于等待wcs确认）
                byte IsOver = commonStackerCrane.Communicator.Read<byte>("DB106.22");
                int tasknum = commonStackerCrane.Communicator.Read<int>("DB106.18");
                //WriteDebug(nameof(CommonStackerCraneJob), $"大堆垛机SC01任务号堆垛机任务号：{tasknum}状态：{IsOver}");
                if (IsOver == 6)
                {
                    if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
                    {
                        _taskService.StackCraneTaskCompleted(tasknum);
                        Console.Out.WriteLine("TaskCompleted" + tasknum);
                        bool issuccess = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
                        if (issuccess)
                        {
                            WriteDebug(nameof(CommonStackerCraneJob), $"堆垛机任务号：{tasknum},堆垛机回写5成功");

                        }
                    }
                }
            }

            return Task.CompletedTask;
        }

@@ -120,7 +149,7 @@
        private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
        {
            Dt_Task task;
            task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
            task = _taskService.QueryStackerCraneTask("R01");
            return task;
        }

@@ -168,7 +197,15 @@
            stackerCraneTaskCommand.Barcode = task.PalletCode;
            stackerCraneTaskCommand.TaskNum = task.TaskNum;
            stackerCraneTaskCommand.WorkType = 1;
            stackerCraneTaskCommand.TrayType = 1;
            if(task.PalletCode.Substring(0,1)=="B")
            {
                stackerCraneTaskCommand.TrayType = 2;
            }
            else
            {
                stackerCraneTaskCommand.TrayType = 1;
            }
            //stackerCraneTaskCommand.TrayType = 1;
            string[] SourceCodes = task.SourceAddress.Split("-");
            if (SourceCodes.Length == 4)
            {