修改测试问题

Administrator

2025-06-12 4b4afa78f556199e5778d5cac88d3d6de6d8c1da

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

@@ -26,47 +26,69 @@
        type2 = "";
        jiebo = "";
        var taskModle = "";//任务模板
        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 (locate1 == null || locate2 == null)
        //前缀L立库 前缀B 平库  
        var locate1q = straLocate.Substring(0,1);   
        var locate2q = endLocate.Substring(0, 1);
        
        if (locate1q == null || locate2q == null)
        {
            return taskModle;
        }
        switch (locate1.WareHouseNo)
        switch (locate1q)
        {
            case "W02":
                type1 = "SITE";
                break;
            case "W04":
            case "L":
                type1 = "STORAGE";
                break;
            case "B":
                type1 = "SITE";
                break;
            default:
                break;
        }

        switch (locate2.WareHouseNo)
        switch (locate2q)
        {
            case "W02":
                type2 = "SITE";
                break;
            case "W04":
            case "L":
                type2 = "STORAGE";
                break;
            case "B":
                type2 = "SITE";
                break;
            default:
                break;
        }
        var  AreaAll = new List<string>() { "B06", "B07" };//1002、1003全部区域
        var Area1002 = new List<string>() { "B06",""};//1002车间区域
        var Area10031 = new List<string>() { ""};//1003 1楼车间区域
        
        var  AreaAll = new List<string>() { "B06", "B07", "B09" };//1002、1003全部区域
        var Area1002 = new List<string>() { "B06"};//1002车间区域
        var Area10031 = new List<string>() { "B09"};//1003 1楼车间区域
        var Area10032 = new List<string>() { "B07"};//1003 2楼车间区域
        if (Area1002.Contains(locate2.AreaNo))

        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" )
        {
            jiebo = "1JB";//接驳位
            if ( Area1002.Contains(locate1.AreaNo) )
            {
                jiebo = "1JB";//接驳位
            }
            if (Area10031.Contains(locate1.AreaNo) || Area10032.Contains(locate1.AreaNo))
            {
                jiebo = "2JB";
            }
        }
        if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo))
        if (locate2q == "B")
        {
            jiebo = "2JB";
            if ( Area1002.Contains(locate2.AreaNo))
            {
                jiebo = "1JB";//接驳位
            }
            if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo))
            {
                jiebo = "2JB";
            }
        }
        
        if (type1 == "" || type2 == "")
        {
            return taskModle;
@@ -77,32 +99,40 @@
            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":
                {
                    if (Area10032.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
                    if ((Area10032.Contains(locate1.AreaNo) || Area10031.Contains(locate1.AreaNo)) && locate2.AreaNo == "B04")
                    {
                        taskModle = "CPRK";
                        taskModle = "CPRK1003";
                    }
                    else if(Area1002.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
                    {
                        taskModle = "CPRK2";
                        taskModle = "CPRK1002";
                    }
                    else if ((Area10032.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo)) && !AreaAll.Contains(locate1.AreaNo))
                    else if ((Area10032.Contains(locate2.AreaNo) || Area10031.Contains(locate2.AreaNo)) && !AreaAll.Contains(locate1.AreaNo))
                    {
                        taskModle = "YFLSX";
                        taskModle = "YCLSX";
                    }
                    else if (Area1002.Contains(locate2.AreaNo) && !AreaAll.Contains(locate1.AreaNo))
                    {
                        taskModle = "YFLSX2";
                        taskModle = "YCLSX2";
                    }

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