mes取消修改

海波 张

2 天以前 5b9da592f9bc117c88244f469418d5a5b29e4266

 dispatch/WcsTask.cs

@@ -5,6 +5,7 @@
using HH.WCS.ZhongCeJinTan.util;
using HH.WCS.ZhongCeJinTan.wms;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
using S7.Net.Types;
using System;
using System.Collections.Generic;
@@ -13,6 +14,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Web.Services.Description;
using Top.Api;
using static HH.WCS.ZhongCeJinTan.api.ApiModel;
using static HH.WCS.ZhongCeJinTan.wms.WcsModel;

@@ -39,79 +41,87 @@
            string Traycode = mst.S_CNTR_CODE;
            var isFu = "0";

            var cntr = ContainerHelper.GetCntr(Traycode);

            if (cntr!=null)
            try
            {
                if (cntr.N_DETAIL_COUNT>0)
                var cntr = ContainerHelper.GetCntr(Traycode);

                if (cntr != null)
                {
                    isFu = "1";
                    if (cntr.N_DETAIL_COUNT > 0)
                    {
                        isFu = "1";
                    }
                }
            }
            var workFlow = TaskHelper.selectWorkFlowByType(mst.N_TYPE.ToString(), mst.TOOLSTYPE);
                var workFlow = TaskHelper.selectWorkFlowByType(mst.N_TYPE.ToString(), mst.TOOLSTYPE);

            

            if (workFlow != null)
            {
                if (workFlow.INOROUT.Contains("入库"))

                if (workFlow != null)
                {
                    Type = "1";
                    if (workFlow.INOROUT.Contains("入库"))
                    {
                        Type = "1";
                    }

                    if (workFlow.INOROUT.Contains("出库"))
                    {
                        Type = "2";
                        var count = TaskHelper.GetConnectionTask(mst.S_END_LOC);
                        if (count >= 2)
                        {
                            return false;
                        }


                    }
                }

                if (workFlow.INOROUT.Contains("出库"))
                if (mst.S_CNTR_CODE.Contains("KJZ"))
                {
                    Type = "2";
                    var count = TaskHelper.GetConnectionTask(mst.S_END_LOC);
                    if (count>=2)
                    TrayType = "KJZ";
                }

                var interact = new
                {
                    requestPk = mst.S_CODE,//任务号
                    contNo = Traycode,//托盘号
                    contType = TrayType,//托盘类型
                    trkType = Type,//任务类型
                    trkPrty = mst.N_PRIORITY,//任务优先级
                    frmPos = mst.S_START_LOC,//起始位置
                    toPos = mst.S_END_LOC,//目的地
                    isFull = isFu,//空托 满托
                    groupNo = Item?.S_ITEM_NAME,//搬送组号
                    clientCode = "WMS",//操作人
                    operationTime = DateTime.Now.ToString()//操作时间
                };
                LogHelper.Info("Wcs立库下发任务 地址信息:" + baseUrl + "receive", "立库下发任务");
                LogHelper.Info("Wcs立库下发任务 参数信息:" + JsonConvert.SerializeObject(interact), "立库下发任务");
                var result = apiHelper.Post(baseUrl + "receive", JsonConvert.SerializeObject(interact));
                LogHelper.Info("Wcs立库下发任务 返回信息:" + JsonConvert.SerializeObject(result), "立库下发任务");
                if (!string.IsNullOrEmpty(result))
                {
                    var res = JsonConvert.DeserializeObject<WcsTaskReturn>(result);
                    if (res.code == "0")
                    {
                        TaskHelper.UpdateStatus(mst, "已推送");
                        return true;
                    }
                    else
                    {
                        return false;
                    }


                }
            }

            if (mst.S_CNTR_CODE.Contains("KJZ"))
            {
                TrayType = "KJZ";
            }
           
            var interact = new
            {
                requestPk = mst.S_CODE,//任务号
                contNo = Traycode,//托盘号
                contType = TrayType,//托盘类型
                trkType = Type,//任务类型
                trkPrty = mst.N_PRIORITY,//任务优先级
                frmPos = mst.S_START_LOC,//起始位置
                toPos = mst.S_END_LOC,//目的地
                isFull = isFu,//空托 满托
                groupNo = Item?.S_ITEM_NAME,//搬送组号
                clientCode = "WMS",//操作人
                operationTime = DateTime.Now.ToString()//操作时间
            };
            LogHelper.Info("Wcs立库下发任务 地址信息:" + baseUrl + "receive", "立库下发任务");
            LogHelper.Info("Wcs立库下发任务 参数信息:" + JsonConvert.SerializeObject(interact), "立库下发任务");
            var result = apiHelper.Post(baseUrl + "receive", JsonConvert.SerializeObject(interact));
            LogHelper.Info("Wcs立库下发任务 返回信息:" + JsonConvert.SerializeObject(result), "立库下发任务");
            if (!string.IsNullOrEmpty(result))
            {
                var res = JsonConvert.DeserializeObject<WcsTaskReturn>(result);
                if (res.code == "0")
                {
                    TaskHelper.UpdateStatus(mst, "已推送");
                    return true;
                }
                else
                {
                    LogHelper.Info("Wcs立库下发任务 返回信息为空", "立库下发任务");
                    return false;
                }
            }
            else
            catch (Exception)
            {
                LogHelper.Info("Wcs立库下发任务 返回信息为空", "立库下发任务");
                return false;

                throw;
            }
        }

@@ -253,10 +263,12 @@
                {
                    result.msg = "Wcs下发任务成功";
                    result.code = "0";
                    result.requestPk = model.requestPk;
                }
                else {
                    result.msg = "Wcs下发任务失败";
                    result.code = "1";
                    result.requestPk = model.requestPk;
                }
                return result;

@@ -264,8 +276,9 @@
            catch (Exception ex)
            {
                newDb.RollbackTran();
                result.msg = ex.Message;
                result.msg = "Wcs下发任务异常";
                result.code = "1";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs下发任务异常" + ex.Message, "Wcs下发任务");
                return result;
            }
@@ -593,7 +606,6 @@

            try
            {
            
                var taskNo = "";
            
                if (string.IsNullOrEmpty(model.requestPk))
@@ -613,6 +625,13 @@
                    throw new Exception("未查询到对应的任务");
                }

                if (transportTask.S_B_STATE == "完成" || transportTask.S_B_STATE == "取消")
                {
                    throw new Exception($"{transportTask}任务已{transportTask.S_B_STATE}，不允许操作");
                }


             
                TaskHelper.WcsAddActionRecord(model.requestPk, model.noticeType, "WCS");

                switch (model.noticeType)
@@ -662,29 +681,29 @@
                                RfidChek.S_RESULT = "RFID校验失败";
                                if (WcsCancellTask(transportTask))
                                {
                                    ContainerHelper.delCntr(transportTask.S_CNTR_CODE);
                                    ContainerHelper.delCntrItem(transportTask.S_CNTR_CODE);
                                   
                                    TaskHelper.Fail(transportTask);
                                    TaskProcess.OperateStatus(transportTask, 7);

                                    
                                    var agvTask = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");

                                    if (agvTask == null)
                                    {
                                        LogHelper.Info($"RFID校验失败，没找到对应{transportTask.S_OP_CODE}的agv任务", "Wcs任务执行通知");
                                        throw new Exception($"RFID校验失败,没找到对应{transportTask.S_OP_CODE }的agv任务");
                                        throw new Exception($"RFID校验失败,没找到对应{transportTask.S_OP_CODE}的agv任务");
                                    }
                                    var workFlow = TaskHelper.selectWorkFlowByType(agvTask.N_TYPE.ToString(), agvTask.TOOLSTYPE);
                                  
                                        if (workFlow == null)
                                        {
                                            LogHelper.Info($"RFID校验失败，没找到对应作业流程", "Wcs任务执行通知");
                                            throw new Exception($"RFID校验失败,没找到对应作业流程");
                                        }

                                    if (workFlow == null)
                                    {
                                        LogHelper.Info($"RFID校验失败，没找到对应作业流程", "Wcs任务执行通知");
                                        throw new Exception($"RFID校验失败,没找到对应作业流程");
                                    }
                                    //查找终点
                                    var endList = LocationHelper.GetAllLocList1(workFlow.ERRORAREA);

                                    var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ERRORAREA,workFlow.ROADWAY);
                                    //var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ERRORAREA,workFlow.ROADWAY);
                                    var end = LocationHelper.FindEndcolByLoc(endList, workFlow.ERRORAREA);
                                    LogHelper.Info($"RFID校验失败下发异常终点信息" + JsonConvert.SerializeObject(end), "Wcs任务执行通知");


@@ -693,21 +712,33 @@
                                        LogHelper.Info($"RFID校验失败下发任务失败，终点库区{workFlow.ERRORAREA},没找到终点", "Wcs任务执行通知");
                                        throw new Exception($"RFID校验失败终点库区{workFlow.ERRORAREA},没找到终点");
                                    }
                                    LocationHelper.LockLoc(end.S_CODE, "入库锁", 1);
                                    agvTask.S_START_LOC = agvTask.S_END_LOC;
                                    agvTask.S_START_AREA = agvTask.S_END_AREA;
                                    agvTask.S_START_AREA_NAME = agvTask.S_END_AREA_NAME;
                                    agvTask.S_END_LOC = end.S_CODE;
                                    agvTask.S_END_AREA = end.S_AREA_CODE;
                                    agvTask.S_END_AREA_NAME = end.S_AREA_Name;
                                    agvTask.S_TYPE = workFlow.FLOWNAME;

                                    newDb.BeginTran();
                                    var I = newDb.Updateable(agvTask).UpdateColumns(it => new { it.S_START_LOC, it.S_START_AREA,it.S_END_LOC,it.S_END_AREA,it.S_TYPE,it.S_B_STATE }).ExecuteCommand();
                                    var I = newDb.Updateable(agvTask).UpdateColumns(it => new { it.S_START_LOC, it.S_START_AREA, it.S_END_LOC, it.S_END_AREA, it.S_TYPE, it.S_B_STATE, it.S_START_AREA_NAME, it.S_END_AREA_NAME }).ExecuteCommand();
                                    if (I == 0)
                                    {
                                        throw new Exception("修改任务表失败");
                                    }
                                    newDb.CommitTran();

                                    var agvTask1 = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");
                                    TaskHelper.opMesTask(agvTask1, 3);
                                    ContainerHelper.delCntr(transportTask.S_CNTR_CODE);
                                    ContainerHelper.delCntrItem(transportTask.S_CNTR_CODE);
                                }
                                else {
                                    LogHelper.Info($"RFID校验失败，通知Wcs取消任务失败", "Wcs任务执行通知");
                                    throw new Exception($"RFID校验失败，通知Wcs取消任务失败");
                                }
                            }

                            newDb.BeginTran();
                            var R = newDb.Insertable(RfidChek).ExecuteCommand();
                            if (R == 0)
@@ -715,25 +746,35 @@
                                throw new Exception("添加RFID校验表失败");
                            }
                            newDb.CommitTran();

                        }
                        break;
                    //9取货无货
                    case "9":
                        LogHelper.Info($"任务号{transportTask.S_CODE},取货无货,取消任务", "Wcs任务执行通知");
                        if (WcsCancellTask(transportTask)) {
                            LogHelper.Info($"任务号{transportTask.S_CODE},取消任务成功，起点{transportTask.S_START_LOC}设为异常", "Wcs任务执行通知");
                            TaskHelper.Fail(transportTask);
                            TaskProcess.OperateStatus(transportTask, 7);
                            LocationHelper.updateLocLock(transportTask.S_START_LOC, 4, "异常锁");
                            var agvTask = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");
                            if (agvTask!=null)
                    //取货完成
                    case "5":
                        TaskHelper.UpdateStatus(transportTask, "取货完成");
                        LocationHelper.UnBindingLoc(transportTask.S_START_LOC, transportTask.S_CNTR_CODE.Split(',').ToList());
                        break;

                    //7取消
                    case "7":
                        LogHelper.Info($"任务号{transportTask.S_CODE},取消任务成功", "Wcs任务执行通知");
                        TaskHelper.Fail(transportTask);
                        TaskProcess.OperateStatus(transportTask, 7);

                        if (transportTask.S_TYPE.Contains("出库"))
                        {
                            var agvTask1 = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");
                            if (agvTask1 != null)
                            {
                                TaskHelper.Fail(agvTask);
                                NDCApi.CancelOrder(agvTask.S_CODE.Trim());
                                TaskProcess.CacheBitCancelUpdate(agvTask);
                                TaskHelper.Fail(agvTask1);
                                NDCApi.CancelOrder(agvTask1.S_CODE.Trim());
                                TaskProcess.CacheBitCancelUpdate(agvTask1);
                            }
                        }
                        else {
                            ContainerHelper.delCntr(transportTask.S_CNTR_CODE);
                            ContainerHelper.delCntrItem(transportTask.S_CNTR_CODE);
                        }

                        break;
                    default:
                        break;
@@ -741,14 +782,18 @@

                result.msg = "通知成功";
                result.code = "0";
                result.requestPk = model.requestPk;

            }
            catch (Exception ex)
            {
                newDb.RollbackTran();
                result.msg = ex.Message;
                result.code = "1";
               

                LogHelper.Info("Wcs任务执行通知异常" + ex.Message, "Wcs任务执行通知");
                result.msg = "Wcs任务执行通知异常";
                result.code = "1";
                result.requestPk = model.requestPk;
                newDb.RollbackTran();
                return result;
            }
            return result;
@@ -800,14 +845,16 @@
                newDb.CommitTran();
                result.code = "0";
                result.msg = "成功";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs报警上报返回"+ JsonConvert.SerializeObject(result), "报警上报");
                return result;
            }
            catch (Exception ex)
            {
                newDb.RollbackTran();
                result.msg = ex.Message;
                result.msg = "Wcs报警信息异常";
                result.code = "1";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs报警信息异常" + ex.Message, "报警上报");
                return result;
            }
@@ -925,14 +972,16 @@
               
                result.code = "0";
                result.msg = "成功";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs巷道可用上报返回" + JsonConvert.SerializeObject(result), "巷道可用上报");
                return result;
            }
            catch (Exception ex)
            {
                newDb.RollbackTran();
                result.msg = ex.Message;
                result.msg = "Wcs巷道可用上报异常";
                result.code = "1";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs巷道可用上报异常" + ex.Message, "巷道可用上报");
                return result;
            }
@@ -952,86 +1001,112 @@
            string bit = "";
            var Meshod = "";
            var newDb = new SqlHelper<object>().GetInstance();
            var tac = newDb.Queryable<WcsSafety>().Where(a => a.TaskNo == mst.S_CODE && a.Sign == state).ToList();
            if (tac.Count() > 0)
            {
                LogHelper.Info("查询到安全请求信号记录表已经存在数据,此次信号不下达给立库", "agv执行通知");
                return true;
            }
            switch (state)
            {
                case 1101:
                    Type = "1";
                    bit = mst.S_START_LOC;
                    Meshod = "AgvRequest";
                    break;
                case 1102:
                    Type = "1";
                    bit = mst.S_START_LOC;
                    Meshod = "Complete";
                    break;
                case 1103:
                    Type = "2";
                    bit = mst.S_END_LOC;
                    Meshod = "AgvRequest";
                    break;
                case 1104:
                    Type = "2";
                    bit = mst.S_END_LOC;
                    Meshod = "Complete";
                    break;
                case 7:
                    Type = "5";
                    bit = mst.S_END_LOC;
                    Meshod = "AgvRequestCancel";
                    break;
            }




            var interact = new
            try
            {
                requestPk = mst.S_CODE,//任务号
                trkType = Type,//任务类型
                method = Meshod,//API名称
                stnNo = bit,//目的地站台号
                carNo = forkliftNo,// 车号
                clientCode = "WMS",//操作人
                operationTime = DateTime.Now.ToString()//操作时间
            };
            LogHelper.Info("agv执行通知 地址信息:" + baseUrl + "agvCallback", "agv执行通知");
            LogHelper.Info("agv执行通知 参数信息:" + JsonConvert.SerializeObject(interact), "agv执行通知");
            var result = apiHelper.Post(baseUrl + "agvCallback", JsonConvert.SerializeObject(interact));
            LogHelper.Info("agv执行通知 返回信息:" + JsonConvert.SerializeObject(result), "agv执行通知");
            if (!string.IsNullOrEmpty(result))
            {
                var res = JsonConvert.DeserializeObject<WcsTaskCallBack>(result);
                if (res.code == "0")
                var tac = newDb.Queryable<WcsSafety>().Where(a => a.TaskNo == mst.S_CODE && a.Sign == state).ToList();
                if (tac.Count() > 0)
                {
                    WcsSafety Sign = new WcsSafety();
                    Sign.TaskNo = mst.S_CODE;
                    Sign.Sign = state;
                    newDb.BeginTran();
                    var B = newDb.Insertable(Sign).ExecuteCommand();
                    if (B == 0)
                    {
                        newDb.RollbackTran();
                    }
                    newDb.CommitTran();
                    LogHelper.Info("agv执行通知成功:", "agv执行通知");
                    LogHelper.Info("查询到安全请求信号记录表已经存在数据,此次信号不下达给立库", "agv执行通知");
                    return true;
                }
                switch (state)
                {
                    case 1101:
                        Type = "1";
                        bit = mst.S_START_LOC;
                        Meshod = "AgvRequest";
                        break;
                    case 1102:
                        Type = "1";
                        bit = mst.S_START_LOC;
                        Meshod = "Complete";
                        break;
                    case 1103:
                        Type = "2";
                        bit = mst.S_END_LOC;
                        Meshod = "AgvRequest";
                        break;
                    case 1104:
                        Type = "2";
                        bit = mst.S_END_LOC;
                        Meshod = "Complete";
                        break;
                    case 7:
                        Type = "5";
                        if (mst.S_TYPE.Contains("出库"))
                        {
                            bit = mst.S_START_LOC;
                        }
                        else
                        {
                            bit = mst.S_END_LOC;
                        }

                        //退库取消发agv起点
                        if (LocationHelper.GetErroArea(mst.S_END_AREA))
                        {
                            bit = mst.S_START_LOC;
                        }


                        Meshod = "AgvRequestCancel";
                        break;
                }




                var interact = new
                {
                    requestPk = mst.S_CODE,//任务号
                    trkType = Type,//任务类型
                    method = Meshod,//API名称
                    stnNo = bit,//目的地站台号
                    carNo = forkliftNo,// 车号
                    clientCode = "WMS",//操作人
                    operationTime = DateTime.Now.ToString()//操作时间
                };
                LogHelper.Info("agv执行通知 地址信息:" + baseUrl + "agvCallback", "agv执行通知");
                LogHelper.Info("agv执行通知 参数信息:" + JsonConvert.SerializeObject(interact), "agv执行通知");
                var result = apiHelper.Post(baseUrl + "agvCallback", JsonConvert.SerializeObject(interact));
                LogHelper.Info("agv执行通知 返回信息:" + JsonConvert.SerializeObject(result), "agv执行通知");
                if (!string.IsNullOrEmpty(result))
                {
                    var res = JsonConvert.DeserializeObject<WcsTaskCallBack>(result);
                    if (res.code == "0")
                    {
                        WcsSafety Sign = new WcsSafety();
                        Sign.TaskNo = mst.S_CODE;
                        Sign.Sign = state;
                        newDb.BeginTran();
                        var B = newDb.Insertable(Sign).ExecuteCommand();
                        if (B == 0)
                        {
                            newDb.RollbackTran();
                        }
                        newDb.CommitTran();
                        LogHelper.Info("agv执行通知成功:", "agv执行通知");
                        return true;
                    }
                    else
                    {
                        return false;
                    }
                }
                else
                {
                    LogHelper.Info("agv执行通知成功 返回信息为空", "agv执行通知");
                    return false;
                }
            }
            else
            catch (Exception)
            {
                LogHelper.Info("agv执行通知成功 返回信息为空", "agv执行通知");
                return false;

                throw;
            }

           

        }

@@ -1158,41 +1233,73 @@
                            throw new Exception($"未查询到任务号{model.taskNo}的任务");
                        }

                        if (task.S_B_STATE.Contains("完成")|| task.S_B_STATE.Contains("取消") || task.S_B_STATE.Contains("失败"))
                    if (task.S_TYPE.Contains("出库"))
                    {
                        //取货无货
                        LogHelper.Info($"任务号{task.S_CODE},取货无货,取消任务", "放货有货");
                        if (WcsCancellTask(task))
                        {
                            LogHelper.Info($"任务号{task.S_CODE},取消任务成功，起点{task.S_START_LOC}设为异常", "放货有货");
                            TaskHelper.Fail(task);
                            TaskProcess.OperateStatus(task, 7);
                            LocationHelper.updateLocLock(task.S_START_LOC, 4, "异常锁");
                            var agvTask = TaskHelper.GetTaskByWorkNo(task.S_OP_CODE, "agv");
                            if (agvTask != null)
                            {
                                if (agvTask.S_B_STATE!="未执行")
                                {
                                    NDCApi.CancelOrder(agvTask.S_CODE.Trim());
                                }
                                TaskHelper.Fail(agvTask);
                                TaskProcess.CacheBitCancelUpdate(agvTask);
                            }
                        }

                    }
                    else {
                        //卸货有货
                        if (task.S_B_STATE.Contains("完成") || task.S_B_STATE.Contains("取消") || task.S_B_STATE.Contains("失败"))
                        {
                            throw new Exception($"任务号{model.taskNo}，任务状态：{task.S_B_STATE}，不能改道");
                        }

                      var endLoc = LocationHelper.GetLocOne(task.S_END_LOC);
                        var endLoc = LocationHelper.GetLocOne(task.S_END_LOC);

                       var end = newDb.Queryable<Location>().Where(a => a.S_AREA_CODE == endLoc.S_AREA_CODE && a.N_ROW == endLoc.N_ROW && a.N_COL > endLoc.N_COL && a.S_LOCK_STATE == "无" && a.N_CURRENT_NUM == 0 && a.C_ENABLE=="Y").OrderBy(b=>b.N_COL).First();
                        var end = newDb.Queryable<Location>().Where(a => a.S_AREA_CODE == endLoc.S_AREA_CODE && a.N_ROW == endLoc.N_ROW && a.N_COL > endLoc.N_COL && a.S_LOCK_STATE == "无" && a.N_CURRENT_NUM == 0 && a.C_ENABLE == "Y").OrderBy(b => b.N_COL).First();

                      LogHelper.Info($"Wcs放货有货寻找新终点信息" + JsonConvert.SerializeObject(end), "放货有货");
                        LogHelper.Info($"Wcs放货有货寻找新终点信息" + JsonConvert.SerializeObject(end), "放货有货");

                    if (end!=null)
                    {
                        newDb.BeginTran();
                        endLoc.N_LOCK_STATE = 4;
                        endLoc.S_LOCK_STATE = "异常锁";
                        newDb.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand();
                        task.S_END_LOC = end.S_CODE;
                        newDb.Updateable(task).UpdateColumns(it => new { it.S_END_LOC }).ExecuteCommand();
                        newDb.CommitTran();
                        LocationHelper.LockLoc(end.S_CODE, "入库锁", 1);
                        result.msg = end.S_CODE;
                        result.code = "0";
                        if (end != null)
                        {
                            newDb.BeginTran();
                            endLoc.N_LOCK_STATE = 4;
                            endLoc.S_LOCK_STATE = "异常锁";
                            newDb.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand();
                            task.S_END_LOC = end.S_CODE;
                            newDb.Updateable(task).UpdateColumns(it => new { it.S_END_LOC }).ExecuteCommand();
                            newDb.CommitTran();
                            LocationHelper.LockLoc(end.S_CODE, "入库锁", 1);
                            result.msg = end.S_CODE;
                            result.code = "0";
                            result.requestPk = model.requestPk;
                        }
                        else
                        {
                            throw new Exception($"未查询到库区{endLoc.S_AREA_CODE}有符合的货位");
                        }
                    }
                    else
                    {
                        throw new Exception($"未查询到库区{endLoc.S_AREA_CODE}有符合的货位");
                     }

                        result.msg = "Wcs放货有货/取货无货处理成功";
                        result.code = "0";
                        result.requestPk = model.requestPk;
                        return result;
                    }
                    catch (Exception ex)
                    {
                        newDb.RollbackTran();
                        result.msg = ex.Message;
                        result.msg = "Wcs放货有货异常";
                        result.code = "1";
                        result.requestPk = model.requestPk;
                        LogHelper.Info("Wcs放货有货异常" + ex.Message, "放货有货");
                    return result;
                    }
@@ -1208,7 +1315,6 @@
            public static WcsWarningReurn agvResponse(agvResponseParme model) {
            var result = new WcsWarningReurn();
            var newDb = new SqlHelper<object>().GetInstance();

            try
            {
                newDb.BeginTran();
@@ -1230,20 +1336,20 @@
                newDb.CommitTran();
                result.code = "0";
                result.msg = "成功";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs通知确认返回" + JsonConvert.SerializeObject(result), "通知确认");
                return result;
            }
            catch (Exception ex)
            {
                newDb.RollbackTran();
                result.msg = ex.Message;
                result.msg = "Wcs通知确认异常";
                result.code = "1";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs通知确认异常" + ex.Message, "通知确认");
                return result;
            }
        }
        

    }
    
    
@@ -1260,6 +1366,18 @@
            public string status { get; set; }
    }


    /// <summary>
    /// mes汇报任务返回
    /// </summary>
    public class MesTaskReturn
    {
        public string code { get; set; }
        public string msg { get; set; }
        public bool success { get; set; }
        public DateTime lastTime { get; set; }
    }

    /// <summary>
    /// Mes接口返回
    /// </summary>