mes取消修改

海波 张

2 天以前 5b9da592f9bc117c88244f469418d5a5b29e4266

 core/Monitor.cs

@@ -23,6 +23,8 @@
    /// </summary>
    internal class Monitor
    {
        private static object CreateTaskLocker = new object();

        /// <summary>
        /// 根据作业创建对应任务
        /// </summary>
@@ -30,12 +32,18 @@
        {
            var db = new SqlHelper<object>().GetInstance();

            // 获取所有等待中的作业
            var operations = db.Queryable<WmsWork>().Where(p => p.N_B_STATE == 0).ToList();
            foreach (var operation in operations)
            lock (CreateTaskLocker)
            {
                TaskHelper.CreateTask(operation);
                // 获取所有等待中的作业
                var operations = db.Queryable<WmsWork>().Where(p => p.N_B_STATE == 0).ToList();

                foreach (var operation in operations)
                {
                    TaskHelper.CreateTask(operation);
                }
            }

            
        }


@@ -154,10 +162,10 @@
                                switch (model.state)
                                {
                                    case 1:
                                        TaskHelper.opMesTask(wmsTask, 1);
                                        TaskHelper.Begin(wmsTask, model.forklift_no);
                                        //胎面交互
                                        TaskHelper.TmSafety(wmsTask);
                                        TaskHelper.opMesTask(wmsTask,1);
                                        break;
                                    case 3:
                                        TaskHelper.UpdateStatus(wmsTask, "开始取货");
@@ -189,17 +197,18 @@
                                        LogHelper.Info($"任务{wmsTask.S_CODE}完成，判断入库优先级", "入库优先级");
                                        TaskProcess.inPri(wmsTask);
                                        TaskHelper.End(wmsTask);
                                        TaskHelper.opMesTask(wmsTask, 2);
                                       
                                        break;
                                    case 7:
                                            var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
                                        if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA)) {
                                            TaskHelper.opMesTask(wmsTask, 3);
                                        }
                                            
                                        var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
                                            if (wcsTask1 != null)
                                            {
                                                //agv执行通知 wcs取消  
                                                if (wcsTask1.S_B_STATE != "未执行" && wcsTask1.S_B_STATE != "完成" && wcsTask1.S_B_STATE != "取消")
                                                {
                                                    WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                }
                                                WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                TaskHelper.Fail(wcsTask1);
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                            }
@@ -212,17 +221,21 @@
                                        {
                                            ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                            ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                            ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
                                        }

                                        //出库取消判断接驳位是否有货，有货需要解绑
                                        if (!WcsTask.WcsCvstate(wmsTask))
                                        {
                                            LogHelper.Info($"Wcs立库接驳位无货，解绑货位:{wmsTask.S_START_LOC}", "立库");
                                            TaskProcess.OperateStatus(wmsTask, 4);
                                            ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                            ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                        else {
                                            //出库取消判断接驳位是否有货，有货需要解绑
                                            if (!WcsTask.WcsCvstate(wmsTask))
                                            {
                                                LogHelper.Info($"Wcs立库接驳位无货，解绑货位:{wmsTask.S_START_LOC}", "立库");
                                                TaskProcess.OperateStatus(wmsTask, 4);
                                                ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                                ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                            }
                                        }
                                        TaskHelper.opMesTask(wmsTask, 3);
                                        
                                      
                                       
                                        break;

                                }