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);
                }
            }

            
        }


@@ -88,22 +96,33 @@
        public static void UpdateOutTaskPriority()
        {
            var db = new SqlHelper<object>().GetInstance();
            var st = Settings.outMinutePriority;
            //var st = Settings.outMinutePriority;

            var st = TaskHelper.GetOutMinutePriority();

            if (st==null)
            {
                return;
            }

            var list = TaskHelper.GetWcsTaskListByState("执行", "agv", "出库");

            foreach (var item in list)
            {
                var action = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE==item.S_CODE && p.N_ACTION_CODE == 1).First();
                if (action != null)
                {
                    var action3 = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 3).First();
                    if (action3 == null)
                var wcsTask = TaskHelper.GetTaskByState("完成", "wcs", item.S_OP_CODE, "出库");
                if (wcsTask != null) {
                    var action = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 1).First();
                    if (action != null)
                    {
                        if (DateTime.Now.Subtract(action.T_CREATE).TotalMinutes > st.Minute)
                        var action3 = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 3).First();
                        if (action3 == null)
                        {
                            item.N_PRIORITY += st.Priority;
                            db.Updateable(item).UpdateColumns(it => new { it.N_PRIORITY }).ExecuteCommand();
                            NDCApi.ChangeOrderPri(item.S_CODE, item.N_PRIORITY);
                            if (DateTime.Now.Subtract(action.T_CREATE).TotalMinutes > st.Minute)
                            {
                                item.N_PRIORITY += st.Priority;
                                db.Updateable(item).UpdateColumns(it => new { it.N_PRIORITY }).ExecuteCommand();
                                NDCApi.ChangeOrderPri(item.S_CODE, item.N_PRIORITY);
                            }
                        }
                    }
                }
@@ -143,6 +162,7 @@
                                switch (model.state)
                                {
                                    case 1:
                                        TaskHelper.opMesTask(wmsTask, 1);
                                        TaskHelper.Begin(wmsTask, model.forklift_no);
                                        //胎面交互
                                        TaskHelper.TmSafety(wmsTask);
@@ -177,20 +197,22 @@
                                        LogHelper.Info($"任务{wmsTask.S_CODE}完成，判断入库优先级", "入库优先级");
                                        TaskProcess.inPri(wmsTask);
                                        TaskHelper.End(wmsTask);
                                       
                                        break;
                                    case 7:

                                        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取消
                                            WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
                                            if (!TaskHelper.CheckActionRecordExist(wcsTask1.S_CODE, "6"))
                                            if (wcsTask1 != null)
                                            {
                                                //agv执行通知 wcs取消  
                                                WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                TaskHelper.Fail(wcsTask1);
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                            }
                                        }
                                        

                                        TaskHelper.Fail(wmsTask);
                                        TaskProcess.OperateStatus(wmsTask, 7);
@@ -199,16 +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);
                                            }
                                        }
                                        
                                      
                                       
                                        break;

                                }
@@ -342,15 +369,14 @@
                        var cntrCode = LocationHelper.GetLocCntrCode(start.S_CODE);

                        if (workFlow.SENDWCS == "Y")
                        {

                        {   
                            //正式代码，调用接口寻找可用接驳位
                            var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);

                            var balanceConnectionList = LocationHelper.GetBalanceConnectionList(connectionList);
                            foreach (var item in balanceConnectionList)
                            {
                                if (item.loc.N_CURRENT_NUM < 2)
                                if (item.loc.N_CURRENT_NUM < 2 && item.loc.CONNEC_ROADWAY == start.N_ROADWAY)
                                {
                                    connection = item.loc.S_CODE;
                                    connectionArea = item.loc.S_AREA_Name;