合肥佳通AGV项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
lss
4 天以前 ede3b3103cc39dbfff9c93e9a08fb1a9855387e4 
 HH.WCS.Mobox3 - ´ó³µ¼ä/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs


@@ -92,7 +92,7 @@


                //    AddErrorInfo("寻找出库区失败", result.msg);


                //    return result;


                //}




                string state = "等待";


                int n_type = 0;  //任务来源 1.密炼立库  3.预备库 ,4.原材料库


                string Source = "";


                switch (taskData.source)


@@ -104,6 +104,7 @@


                    case "YBK":


                        n_type = 2;


                        Source = "预备库";


                        state = "等待推送";


                        break;




                }


@@ -170,15 +171,7 @@


                            AddErrorInfo("库区查找失败", result.msg);


                            return result;


                        }


                        int pri = 1;


                        var area = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).First();


                        if (area != null)


                        {


                            if (area.XbAreaCodes.Contains(endloc.S_AREA_CODE))


                            {


                                pri = 2;


                            }


                        }




                        //创建wcs任务


                        var wcsTask = new WCSTask


                        {


@@ -193,12 +186,13 @@


                            S_END_AREA = endloc.S_AREA_CODE,


                            N_SCHEDULE_TYPE = 1,


                            S_CNTR_CODE = CntrCode,


                            N_PRIORITY = pri,


                            N_PRIORITY = 1,


                            Z_TYPE = n_type,


                            N_START_LAYER = 1,


                            N_END_LAYER = 1,


                            S_WMS_NO = taskData.wmsTaskNo,


                            S_NOTE = note,


                            S_B_STATE = state,


                            S_MES_NO = taskData.mesTaskNo




                        };


@@ -241,7 +235,50 @@


        }






        /// <summary>


        /// é¢„备库任务状态下发


        /// </summary>


        /// <param name="model"></param>


        /// <returns></returns>


        internal static Result MstStateInquire(MstStateInquire model)


        {


            Result result = new Result() { code = "200", msg = "状态下发成功" };


            var db = new SqlHelper<object>().GetInstance();


            if (model == null)


            {


                LogHelper.Info($"MstStateInquire==> å‚数为null");


                result.code = "1";


                result.msg = "参数为null值，请检查参数格式";


                AddErrorInfo("参数为空", result.msg);


                return result;


            }


            try


            {


                //找到任务，修改任务状态


                var task = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == model.taskNum).First();


                if (task != null)


                {


                    task.S_B_STATE ="等待";


                    db.Updateable(task).UpdateColumns(a => new { a.S_B_STATE}).ExecuteCommand();


                }


                else


                {


                    result.code = "1";


                    result.msg = $"根据下发任务号{model.taskNum}未找到对应任务";


                    AddErrorInfo("未找到任务", result.msg);


                    return result;


                }


                return result;


            }


            catch (Exception ex)


            {


                result.code = "1";


                result.msg = ex.ToString();


                LogHelper.Error("TrayItembind Error：" + ex.ToString(), ex);


                return result;


            }




        }






        public static object _Point = new object();


@@ -252,7 +289,7 @@


        /// <returns></returns>


        internal static Result Point(PointModel model)


        {


            Result result = new Result() { code = "200", msg = "入平库任务下发成功" };


            Result result = new Result() { code = "200", msg = "任务下发成功" };


            string Source = "Mes";




            if (model == null)


@@ -305,25 +342,25 @@


                        AddErrorInfo("货位查找失败", result.msg, Source);


                        return result;


                    }


                    else


                    {


                        //判断起点是否绑定其他托盘


                        var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).OrderBy(a => a.T_CREATE).FirstOrDefault();


                        if (CntrRel != null)


                        {


                            if (CntrRel.S_CNTR_CODE != model.Rfid)


                            {


                                result.code = "1";


                                result.msg = $"根据起点：{model.InitialLocation}获取托盘:{CntrRel.S_CNTR_CODE}与下发托盘：{model.Rfid}不一致，请检查托盘码是否正确";


                                AddErrorInfo("托盘码校检失败", result.msg, Source);


                                return result;


                            }


                        }


                        else


                        {


                            LocationHelper.BindingLoc(startloc.S_CODE, new List<string> { model.Rfid });


                        }


                    }


                    //else


                    //{


                    //    //判断起点是否绑定其他托盘


                    //    var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).OrderBy(a => a.T_CREATE).FirstOrDefault();


                    //    if (CntrRel != null)


                    //    {


                    //        if (CntrRel.S_CNTR_CODE != model.Rfid)


                    //        {


                    //            result.code = "1";


                    //            result.msg = $"根据起点：{model.InitialLocation}获取托盘:{CntrRel.S_CNTR_CODE}与下发托盘：{model.Rfid}不一致，请检查托盘码是否正确";


                    //            AddErrorInfo("托盘码校检失败", result.msg, Source);


                    //            return result;


                    //        }


                    //    }


                    //    else


                    //    {


                    //        LocationHelper.BindingLoc(startloc.S_CODE, new List<string> { model.Rfid });


                    //    }


                    //}


                    endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == model.TargetLocation).First();


                    if (endloc == null)


                    {


@@ -460,7 +497,7 @@


            var url = Settings.tableUrls.Find(a => a.id == 3);


            if (url != null)


            {


                LogHelper.Info($"货位上报上报：地址:{url}，内容：{date}");


                LogHelper.Info($"货位上报上报：地址:{url.url}，内容：{date}");


                var r = httpHelper.MesWebPost(url.url, date);


                result = JsonConvert.DeserializeObject<Result>(r);


                if (result.code == "200")


@@ -473,7 +510,7 @@


                    result.code = "1";


                    result.msg = result.msg;


                }


                ApiHelper.AddInfo("Mes", "Mes点对点任务下发", JsonConvert.SerializeObject(date), JsonConvert.SerializeObject(result), "Post", url.url);


                ApiHelper.AddInfo("Mes", "货位同步", JsonConvert.SerializeObject(date), JsonConvert.SerializeObject(result), "Post", url.url);




            }


            else