变更优化

lss

2025-07-01 26edf1783992947f441096b155107128910aed82

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

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

                        //有任务号请求
                        switch (model.state)
                        {
@@ -36,6 +35,7 @@
                                break;
                            #region MyRegion
                            case 3:
                                WCSHelper.UpdateAgvNo(TN_Task, model.forklift_no);
                                WCSHelper.UpdateStatus(TN_Task, "开始取货");
                                break;
                            case 4:
@@ -47,7 +47,11 @@
                                break;
                            case 6:
                                WCSHelper.UpdateStatus(TN_Task, "卸货完成");
                                if (TN_Task.S_NOTE != "入库" && 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);
                                }
@@ -65,12 +69,12 @@
                        WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
                        //调用第三方接口（如果有）
                        //物料到位通知
                        if ((TN_Task.S_TYPE == "出平库" || TN_Task.S_TYPE == "余料返回") && model.state == 2)
                        if ((TN_Task.S_TYPE == "出平库" || TN_Task.S_TYPE == "余料返回") && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
                        }
                        if ((TN_Task.S_NOTE == "出库" || TN_Task.S_NOTE == "异常库区入库") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 2)
                        if ((TN_Task.S_NOTE == "出库" || TN_Task.S_NOTE == "异常库区入库") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
@@ -78,6 +82,7 @@
                        //任务回报 任务来源 1.钢丝立库  2.胶片库  3.预备库 5.mes下发
                        if (TN_Task.Z_TYPE == 5)
                        {
                            TN_Task = WCSHelper.GetTask(TN_Task.S_CODE);
                            string urlstate = Settings.tableUrls.Find(a => a.id == 4).url;
                            TaskProcess.MESReportback(TN_Task, model.state, urlstate);
                        }
@@ -159,6 +164,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)
@@ -197,7 +209,7 @@
        {
            //查询任务
            //获取所有等待的任务

            Console.WriteLine("开始任务推送");
            var list = WCSHelper.GetTaskListByState("等待");

            if (list.Count > 0)