出库修改

海波 张

15 小时以前 5321419f5fddb4e877fe90ccd90ebdc1a115af64

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

            
        }


@@ -157,7 +165,6 @@
                                        TaskHelper.Begin(wmsTask, model.forklift_no);
                                        //胎面交互
                                        TaskHelper.TmSafety(wmsTask);
                                        TaskHelper.opMesTask(wmsTask,1);
                                        break;
                                    case 3:
                                        TaskHelper.UpdateStatus(wmsTask, "开始取货");
@@ -166,6 +173,7 @@
                                        TaskHelper.UpdateStatus(wmsTask, "取货完成");
                                        LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
                                        TaskProcess.OperateStatus(wmsTask, 4);
                                        TaskHelper.opMesTask(wmsTask, 1);
                                        break;
                                    case 5:
                                        TaskHelper.UpdateStatus(wmsTask, "开始卸货");
@@ -189,19 +197,23 @@
                                        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());
                                                if (wcsTask1.S_B_STATE.Trim() != "取消" && wcsTask1.S_B_STATE.Trim() != "失败" && wcsTask1.S_B_STATE.Trim() != "完成")
                                                {
                                                    WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                    TaskHelper.Fail(wcsTask1);
                                                    TaskProcess.OperateStatus(wcsTask1, 7);
                                                }
                                                TaskHelper.Fail(wcsTask1);
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                            }
                                        

@@ -212,17 +224,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;

                                }
@@ -334,7 +350,7 @@


                        //寻找立库区空托
                        start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA);
                        start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION);


                        LogHelper.Info($"空托{kt.task_no}出库任务下发起点信息" + JsonConvert.SerializeObject(start), "空托出库");
@@ -356,22 +372,20 @@
                        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 && item.loc.CONNEC_ROADWAY == start.N_ROADWAY)
                                if (item.loc.CONNEC_ROADWAY == start.N_ROADWAY)
                                {
                                    connection = item.loc.S_CODE;
                                    connectionArea = item.loc.S_AREA_Name;
                                    LogHelper.Info($"空托{kt.task_no}出库任务下发寻找到可用接驳位{connection}", "空托出库");
                                    LogHelper.Info($"ZCSendTask出库任务下发寻找到可用接驳位{connection}", "Mes任务下发");
                                    break;
                                }
                            }

                            if (connection == "")
                            {
                                LogHelper.Info($"空托{kt.task_no}出库任务下发寻找接驳位失败", "Mes任空托出库务下发");
@@ -387,9 +401,6 @@
                            continue;
                        }



                        LocationHelper.LockLoc(start.S_CODE, "出库锁", 2);
                      


@@ -431,10 +442,16 @@
                            CONNECTION_AREA = connectionArea
                        };


                        //创建作业
                        if (WMSHelper.CreateWmsWork(operation) && TaskHelper.ChangeMesKtTask(kt))
                        {

                            if (connection != "")
                            {
                                LocationHelper.LockLoc(operation.S_START_LOC, "出库锁", 2);
                                LocationHelper.LockLoc(operation.S_END_LOC, "入库锁", 1);
                                LocationHelper.LockLoc(operation.CONNECTION, "入库锁", 1);
                            }
                            LogHelper.Info($"空托{kt.task_no}出库作业创建成功{operation.S_CODE}", "空托出库");
                        }
                        else