Mes接口修改

海波 张

7 天以前 b67787b031e357c60565d3e1aa8b829706e520e2

 wms/TaskHelper.cs

@@ -425,7 +425,7 @@
                    LogHelper.Info($"任务{task1.S_CODE},{task2.S_CODE}创建成功", "任务");
                    var db = new SqlHelper<object>().GetInstance();
                    db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();

                    LogHelper.Info($"回报{task1.S_OP_CODE}", "回报Mes任务");
                    TaskHelper.opMesTask(task1, 0);
                }
                else
@@ -597,16 +597,48 @@
                var cntrItem = ContainerHelper.GetCntrItem(task.S_CNTR_CODE);
                if (cntrItem == null)
                {
                    LogHelper.Info($"任务{task.S_CODE}没查到容器物料{task.S_CNTR_CODE}", "上下架记录");
                    LogHelper.Info($"任务{task.S_CODE}没查到容器物料{task.S_CNTR_CODE}", "回报Mes任务");
                    return false;
                }

                var work = TaskHelper.GetWmsWork(task.S_OP_CODE);

                if (work == null) {
                    LogHelper.Info($"任务{task.S_CODE}没查到作业{task.S_OP_CODE}", "回报Mes任务");
                    return false;
                }
                var endArea = "";

                if (LocationHelper.GetErroArea(task.S_END_AREA))
                {
                    if (task.S_TYPE.Contains("出库"))
                    {
                        endArea = task.S_END_LOC;
                    }
                    else {
                        endArea = task.S_END_AREA;
                    }

                    
                }
                else {
                    if (task.S_TYPE.Contains("出库"))
                    {
                        endArea = task.S_END_LOC;
                    }
                    else {
                        endArea = work.S_END_AREA;
                    }
                }




                var interact = new
                {
                    taskNo = task.S_OP_CODE,//任务号
                    updater = "WMS",// 操作人 如WMS/MES等
                    endStock = task.S_END_LOC,//终点
                    endStock = endArea,//终点
                    taskStatus = state,//0：初始状态，1：进行中，2：完成，3：任务取消
                    updateTime = DateTime.Now.ToString(),//操作时间
                    TurnCardNum  = cntrItem.TurnCardNum,//周转卡号
@@ -798,6 +830,22 @@
                LocationHelper.LockLoc(task.S_END_LOC, "出库锁", 2);
            }

            if (task.S_SCHEDULE_TYPE.Contains("agv"))
            {

                if (LocationHelper.GetErroArea(task.S_END_AREA))
                {
                    db.Deleteable<Container>().Where(it => it.S_CODE == task.S_CNTR_CODE).ExecuteCommand();
                    db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
                    db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
                }
                else
                {
                    TaskHelper.opMesTask(task, 2);
                }
            }
         

            if (task.S_TYPE.Contains("出库") && task.S_SCHEDULE_TYPE.Contains("agv"))
            {
                var location = db.Queryable<Location>().Where(a => a.S_CODE == task.S_END_LOC).First();
@@ -807,15 +855,6 @@
                db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
                db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
            }


            if (LocationHelper.GetErroArea(task.S_END_AREA)) {
                db.Deleteable<Container>().Where(it => it.S_CODE == task.S_CNTR_CODE).ExecuteCommand();
                db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
                db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
            }


        }