设备控制增加电量显示

wxw

2 天以前 6b2ec7bd05459ddb4ea99df00267dbfda49cbdc7

 Admin.NET/WCS.Application/Util/AGVStorageUtil.cs

@@ -66,13 +66,24 @@
        var locate1 = _db.Queryable<WcsStorageLocat>().First(m => m.IsDelete == false && m.LocatNo == straLocate);
        var locate2 = _db.Queryable<WcsStorageLocat>().First(m => m.IsDelete == false && m.LocatNo == endLocate);

        if (locate1q == "B" || locate2q == "B")
        if (locate1q == "B" )
        {
            if (Area1002.Contains(locate2.AreaNo) || Area1002.Contains(locate1.AreaNo))
            if ( Area1002.Contains(locate1.AreaNo) )
            {
                jiebo = "1JB";//接驳位
            }
            if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo) || Area10031.Contains(locate1.AreaNo) || Area10032.Contains(locate1.AreaNo))
            if (Area10031.Contains(locate1.AreaNo) || Area10032.Contains(locate1.AreaNo))
            {
                jiebo = "2JB";
            }
        }
        if (locate2q == "B")
        {
            if ( Area1002.Contains(locate2.AreaNo))
            {
                jiebo = "1JB";//接驳位
            }
            if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo))
            {
                jiebo = "2JB";
            }
@@ -88,11 +99,16 @@
            case "STORAGE" when type2 == "SITE":
                {
                    taskModle = "FJ";
                    
                }
                break;
            case "SITE" when type2 == "STORAGE":
                {
                    taskModle = "YCRK"; 
                    taskModle = "YCRK";
                    if (locate1.AreaNo == "B10")
                    {
                        taskModle = "DPJRK";
                    }
                }
                break;
            case "SITE" when type2 == "SITE":
@@ -101,9 +117,30 @@
                    {
                        taskModle = "CPRK1003";
                    }
                    else if(Area1002.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
                    else if (Area1002.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
                    {
                        taskModle = "CPRK1002";
                    } 

                    // 车间余料退回到仓库分拣区  liudl
                    else if (locate1.AreaNo == "B06" && (locate2.AreaNo == "B05" || locate2.AreaNo=="B02")) 
                    {
                        taskModle = "TL1002";
                    }
                    else if ((locate1.AreaNo == "B07" || locate1.AreaNo == "B09") && (locate2.AreaNo == "B05" || locate2.AreaNo == "B02"))
                    {
                        taskModle = "TL1003";
                    }

                    // 空托盘到叠托机构
                    else if (locate2.AreaNo == "B10")
                    {
                        taskModle = "DP";
                    }

                    else if (locate1.AreaNo == "B06" && locate2.AreaNo == "B05")
                    {
                        taskModle = "TL1002";
                    }
                    else if ((Area10032.Contains(locate2.AreaNo) || Area10031.Contains(locate2.AreaNo)) && !AreaAll.Contains(locate1.AreaNo))
                    {
@@ -113,7 +150,10 @@
                    {
                        taskModle = "YCLSX2";
                    }

                    //else if (locate2.AreaNo == "B10")
                    //{
                    //    taskModle = "PF-FMR-STACK-NOTIFY-TASK";
                    //}
                }
                break;
            default: