Mes接口修改

海波 张

7 天以前 b67787b031e357c60565d3e1aa8b829706e520e2

 process/TaskProcess.cs

@@ -638,6 +638,15 @@
            return result;
        }

        internal static LocationRecordsResult LocationRecords(LocationRecordsParme model) {
            var result = new LocationRecordsResult();
            var db = new SqlHelper<object>().GetInstance();
            
            return result;
        }

        

        internal static Result MesUdeItem(MesUdeItemParme model)
        {
            var result = new Result();
@@ -956,34 +965,22 @@
            {
                var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");

                var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no,"wcs");
                var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no, "wcs");

                if (task != null && wcsTask != null)
                if (task != null)
                {
                    LogHelper.Info($"cancelTask1取消agv任务{task.S_CODE}：", "取消");
                    if (task.S_B_STATE.Trim() == "未执行")
                    {
                        //未执行直接修改状态为取消
                        LogHelper.Info("cancelTask1取消agv任务：", "取消");
                        TaskHelper.opMesTask(task, 3);
                        TaskHelper.Fail(task);
                        TaskProcess.CacheBitCancelUpdate(task);
                        if (task.S_TYPE.Contains("入库") || task.S_TYPE.Contains("回库"))
                        {
                            ContainerHelper.delCntr(task.S_CNTR_CODE);
                            ContainerHelper.delCntrItem(task.S_CNTR_CODE);
                        }
                        else {
                           WcsTask.WcsCancellTask(wcsTask);
                        }
                        
                       
                        TaskHelper.Fail(wcsTask);
                        TaskProcess.OperateStatus(wcsTask, 7);
                        result.errCode = 0;
                        result.errMsg = "取消成功";
                        result.success = true;
                        return result;
                    }
                    else if (task.S_B_STATE.Trim() != "取消"  && task.S_B_STATE.Trim() != "失败")
                    else if (task.S_B_STATE.Trim() != "取消" && task.S_B_STATE.Trim() != "失败" && task.S_B_STATE.Trim() != "完成")
                    {
                        var db = new SqlHelper<object>().GetInstance();
                        var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "4").First();
@@ -997,22 +994,13 @@
                            result.success = false;
                            return result;
                        }

                        TaskHelper.opMesTask(task, 3);
                        //已推送但是没有完成或者取消，通知hosttoagv
                        TaskHelper.Fail(task);
                        

                        NDCApi.CancelOrder(task.S_CODE.Trim());
                        TaskProcess.CacheBitCancelUpdate(task);
                        if (task.S_TYPE.Contains("入库") || task.S_TYPE.Contains("回库"))
                        {
                            ContainerHelper.delCntr(task.S_CNTR_CODE);
                            ContainerHelper.delCntrItem(task.S_CNTR_CODE);
                        }
                        else {
                            WcsTask.WcsCancellTask(wcsTask);
                        }
                        TaskHelper.Fail(wcsTask);
                        TaskProcess.OperateStatus(wcsTask, 7);

                        result.errCode = 0;
                        result.errMsg = "取消成功";
                        result.success = true;
@@ -1030,11 +1018,52 @@
                    result.errMsg = $"{model.task_no}任务不存在";
                    result.success = false;
                }

                if (wcsTask != null)
                {
                    LogHelper.Info($"cancelTask1取消Wcs任务{wcsTask.S_CODE}", "取消");
                    if (wcsTask.S_B_STATE.Trim() == "未执行")
                    {
                        //未执行直接修改状态为取消
                        if (task.S_TYPE.Contains("入库") || task.S_TYPE.Contains("回库"))
                        {
                            ContainerHelper.delCntr(task.S_CNTR_CODE);
                            ContainerHelper.delCntrItem(task.S_CNTR_CODE);
                        }
                        TaskHelper.Fail(wcsTask);
                        TaskProcess.OperateStatus(wcsTask, 7);
                        result.errCode = 0;
                        result.errMsg = "取消成功";
                        result.success = true;
                        return result;
                    }
                    else if (wcsTask.S_B_STATE.Trim() != "取消" && wcsTask.S_B_STATE.Trim() != "失败" && wcsTask.S_B_STATE.Trim() != "完成")
                    {
                        var db = new SqlHelper<object>().GetInstance();
                        var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "5").First();


                        if (qhflag != null)
                        {
                            LogHelper.Info($"该任务{task.S_CODE}已经取货完成", "取消");
                            result.errCode = 1;
                            result.errMsg = "任务已经取货完成，不允许取消";
                            result.success = false;
                            return result;
                        }
                        WcsTask.WcsCancellTask(wcsTask);
                        TaskHelper.Fail(wcsTask);
                        TaskProcess.OperateStatus(wcsTask, 7);
                        result.errCode = 0;
                        result.errMsg = "取消成功";
                        result.success = true;
                    }
                }
            }
            catch (Exception ex)
            {

                LogHelper.Info("cancelTask1取消任务异常："+ex.Message, "取消");
                LogHelper.Info("cancelTask1取消任务异常：" + ex.Message, "取消");
                result.errCode = 1;
                result.errMsg = "取消任务异常";
                return result;