新增任务推送限制

lss

2025-06-16 663ffc09a8fc33eb7d2346e6ed10c08679f0006c

 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs

@@ -27,12 +27,11 @@
                {
                    if (model.state <= 7)
                    {

                        //有任务号请求
                        switch (model.state)
                        {
                            case 1:
                                WCSHelper.Begin(TN_Task);
                                WCSHelper.Begin(TN_Task, model.forklift_no);
                                break;
                            #region MyRegion
                            case 3:
@@ -47,7 +46,11 @@
                                break;
                            case 6:
                                WCSHelper.UpdateStatus(TN_Task, "卸货完成");
                                if (TN_Task.S_NOTE != "入库")
                                if (!string.IsNullOrEmpty(TN_Task.S_NOTE) && (TN_Task.S_NOTE.Trim() == "入库" || TN_Task.S_NOTE.Trim() == "空托回库"))
                                {
                                    LocationHelper.UnlockLoc(TN_Task.S_END_LOC);
                                }
                                else
                                {
                                    TaskProcess.OperateStatus(TN_Task, 6);
                                }
@@ -104,36 +107,33 @@
                            {
                                LogHelper.Info($"任务回报：任务类型错误");
                            }
                            if (TN_Task.S_TYPE.Contains("电梯"))
                            {
                                if (TN_Task.S_TYPE == "电梯1")
                                {
                                    if (TN_Task.S_CODE == "1" || TN_Task.S_CODE == "3" || TN_Task.S_CODE == "4")
                                    {
                                        TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
                                    }
                                }
                                else if (TN_Task.S_TYPE == "电梯2")
                                {
                                    if (TN_Task.S_CODE == "5" || TN_Task.S_CODE == "6" || TN_Task.S_CODE == "2")
                                    {
                                        TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
                                    }
                                }
                            }
                            //原材料接口需要加上token
                            if (TN_Task.Z_TYPE == 4)
                            else if (TN_Task.Z_TYPE == 4)
                            {
                                Console.WriteLine($"原材料任务回报{TN_Task.S_EQ_NO}");
                                var db = new SqlHelper<object>().GetInstance();

                                var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == TN_Task.S_EQ_NO).ToList();
                                //分档任务回报,任务1只回报1 3 4 任务2只回报 5 6 2
                                if (TN_Task.S_TYPE.Contains("电梯"))
                                {
                                    if (TN_Task.S_TYPE == "电梯1")
                                    {
                                        if (TN_Task.S_CODE == "1" || TN_Task.S_CODE == "3" || TN_Task.S_CODE == "4")
                                        {
                                            TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
                                        }
                                    }
                                    else if (TN_Task.S_TYPE == "电梯2")
                                    {
                                        if (TN_Task.S_CODE == "5" || TN_Task.S_CODE == "6" || TN_Task.S_CODE == "2")
                                        {
                                            TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
                                        }
                                    }
                                }
                                else
                                {
                                    TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
                                }

                                TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
                            }
                            else
                            {
@@ -162,6 +162,13 @@
                    }
                    else
                    {
                        var db = new SqlHelper<TaskAction>().GetInstance();
                        var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == model.task_no && a.N_ACTION_CODE == model.state).First();
                        if (taskAction == null) 
                        {
                            WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
                        }

                        //安全请求等
                        string url = "";
                        if (TN_Task.Z_TYPE == 1)