mes接口修改

海波 张

9 天以前 46dc31d4e66e45cde693b9c909691a710fabfcee

 api/MoboxController.cs

@@ -1,4 +1,5 @@
using HH.WCS.ZhongCeJinTan.device;
using HH.WCS.Mobox3.ZhongCeJinTan.dispatch;
using HH.WCS.ZhongCeJinTan.device;
using HH.WCS.ZhongCeJinTan.dispatch;
using HH.WCS.ZhongCeJinTan.process;
using HH.WCS.ZhongCeJinTan.util;
@@ -25,13 +26,27 @@
            if (task != null) {
                if (task.S_B_STATE.Trim() == "未执行") {
                    //未执行直接修改状态为取消
                    TaskHelper.UpdateStatus(model.TaskNo, "取消");
                
                    LogHelper.Info($"mobox取消agv任务{task.S_CODE}：", "取消");
                    TaskHelper.Fail(task);
                    TaskProcess.CacheBitCancelUpdate(task);
                    TaskHelper.opMesTask(task, 3);
                }
                else if(task.S_B_STATE.Trim() != "取消"&& task.S_B_STATE.Trim() != "完成")  {
                    //if (GZRobot.CancelOrder(task.GZ_ID))
                    //{
                    //    result.resultMsg = "任务取消已经发送给小车";
                    //}  
                    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();


                    if (qhflag != null)
                    {
                        LogHelper.Info($"mobox取消，该任务{task.S_CODE}已经取货完成,，不允许取消", "取消");
                        return result;
                    }
                    TaskHelper.opMesTask(task, 3);
                    //已推送但是没有完成或者取消，通知hosttoagv
                    TaskHelper.Fail(task);
                    NDCApi.CancelOrder(task.S_CODE.Trim());
                    TaskProcess.CacheBitCancelUpdate(task);
                }
                else {
                    result.resultCode = 1;