lss
2025-06-05 71129e21a35a2d4be75ee0f1e96e2c51ced5f23b
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
@@ -12,6 +12,7 @@
using System.Text;
using static HH.WCS.DaYang.api.ApiModel;
using static HH.WCS.DaYang.util.Settings;
using static System.Net.WebRequestMethods;
namespace HH.WCS.DaYang.process
{
@@ -109,8 +110,10 @@
        internal static bool Intercept(WCSTask mst)
        {
            var result = false;
            #region 空托回库任务需要判断有没有执行中的出库任务,接驳位有无托盘,如果有先不推送任务
            if (mst.S_TYPE == "空托回库" && mst.N_SCHEDULE_TYPE == 1)
            #region 空托回库任务需要判断有没有执行中的出库任务,接驳位有无托盘,如果有先不推送任务,任务任务需要agv任务完成再推
            if (mst.S_TYPE == "空托回库")
            {
                if (mst.N_SCHEDULE_TYPE == 1)
            {
                //判断有无出库中的任务
                var task = WCSHelper.GetTaskbyType("出库");
@@ -136,6 +139,23 @@
                    {
                        LogHelper.Info($"Intercept:获取接口url失败");
                    }
                    }
                }
                if (mst.N_SCHEDULE_TYPE == 2)
                {
                    var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
                    if (task != null)
                    { result = true; }
                }
            }
            if (mst.S_TYPE == "出库")
            {
                //推送agv任务,判断设备任务是否完成
                if (mst.N_SCHEDULE_TYPE == 1)
                {
                    var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
                    if (task != null)
                    { result = true; }
                }
            }
            #endregion
@@ -355,21 +375,16 @@
            else if (mst.N_SCHEDULE_TYPE == 2)//输送线任务
            {
                HttpHelper http = new HttpHelper();
                var url = Settings.tableUrls.Find(a => a.id == 1);
                if (url != null)
                TableUrl tableUrl = Settings.tableUrls.Find(a => a.id == 3);
                if (tableUrl != null)
                {
                    //推送输送线任务
                    var SendResult = http.TaskAssignment(mst, url.url);
                    if (SendResult != null && SendResult.Code == 0)
                    var Wcsrsult = http.TaskAssignment(mst, tableUrl.url);
                    if (Wcsrsult.Code == 200)
                    {
                        mst.N_B_STATE = 1;
                        WCSHelper.UpdateStatus(mst);
                        result = true;
                    }
                }
                else
                {
                    LogHelper.Info($"未找到任务下发接口地址,请检查配置文件");
                }
            }
            return result;