1
czw
7 天以前 c97f5e8db6360135d481e933fdac5d3682057adc
HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -1369,45 +1369,32 @@
                    end = LocationHelper.GetAgvSite(mst.S_END_LOC);
                    LogHelper.Info($"瓶坯机翻斗机任务 起点终点对应的agv站点 start {start} end {end}  任务:" + mst.S_TASK_NO);
                }
                //else if (taskType.Contains("收缩膜叉运-入库") || taskType.Contains("收缩膜叉运-入库") || taskType.Contains("收缩膜叉运-货架出提升机"))
                //else if (taskType.Contains("收缩膜叉运-货架出提升机"))
                //{
                //    var ts = 5;
                //    TSNo = 5;
                //    FRow = "1";
                //    ChgTo = "2";
                //    Flow = "0";
                //    Tlow = "0";
                //    DispInfo = "0";
                //    CtrlVal = "1";
                //    start = LocationHelper.GetAgvSite(mst.S_START_LOC);//起点站点
                //    end = LocationHelper.GetAgvSite(mst.S_END_LOC);//终点站点
                //    var dic = new Dictionary<string, string>();
                //    dic.Add("From", start.ToString());
                //    dic.Add("To", end.ToString());
                //    dic.Add("FUNC", "0");
                //    dic.Add("DATA", "0");
                //    int height = 0;
                //    var itemcode = "";
                //    var ItemLayer = 0;
                //    if (mst.N_START_LAYER == 1)
                //    {
                //        CtrlVal = "11";
                //    }
                //    else
                //    {
                //        CtrlVal = "21";
                //    }
                //    var db = new SqlHelper<object>().GetInstance();
                //    var cirs = ContainerHelper.GetCntrItemRel(mst.S_CNTRS.Split(',').ToList().FirstOrDefault()).First();
                //    LogHelper.Info($"原物料 收缩膜叉运 容器物料表数据{JsonConvert.SerializeObject(cirs)}", "HosttoagvTask");
                //    if (cirs != null)
                //    {
                //        var ItemF = db.Queryable<ItemInfo>().Where(a => a.S_ITEM_CODE == cirs.S_ITEM_CODE).First();
                //        itemcode = ItemF.S_ITEM_CODE;
                //        ItemLayer = ItemF.ItemLayer;
                //        if (mst.N_START_LAYER < 3 || mst.N_END_LAYER < 3)
                //        {
                //            height = ItemF.trayHeight;
                //        }
                //        else
                //        {
                //            height = ItemF.trayHeight1;
                //        }
                //    }
                //    dic.Add("ItemHeight", height.ToString());
                //    dic.Add("StaItemHeight", "0");
                //    dic.Add("TrayType", $"{mst.N_START_LAYER}{mst.N_END_LAYER}");
                //    var ggh = NDC.AddTaskNew(ts, mst.N_PRIORITY, mst.S_TASK_NO, dic);
                //    if (ggh)
                //    {
                //        TaskHelper.UpdateStatus(mst, "已推送");
                //        result = true;
                //        GeneralInterFaceFunc(mst, 8 + "");
                //        TRow = ItemF.trayHeight.ToString();
                //    }
                //}
@@ -1648,7 +1635,8 @@
                bool flag8 = res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009);
                if (flag8)
                {
                    TaskHelper.UpdateStatus(mst, "已推送");
                    var ctr2 = LocationHelper.GetList<CntrItemRel>(x => x.S_CNTR_CODE == mst.S_CNTRS.Split(',').ToList().FirstOrDefault()).FirstOrDefault();
                    TaskHelper.UpdateStatus(mst, "已推送", ctr2);
                    result = true;
                    GeneralInterFaceFunc(mst, 8 + "");
                }