Merge branch 'master' into wxw

wxw

2024-09-23 3cf341070c19b24d0e0295431112154738140a7f

 Admin.NET/WCS.Application/PLC/PLCCommon.cs

@@ -32,12 +32,13 @@
        taskInfo.EndLie = "65";
        taskInfo.EndPai = int.Parse(roadWay.Substring(1,2)).ToString();


        // 移库任务
        if (taskType == "2") 
        {
            if (roadWay == endRoadWay)                                              // 同巷道移库,获取目标地址
            {
                taskInfo = GetEndPai(endLocat.Substring(1, 2), endLocat.Substring(0, 2), endLocat.Substring(4, 2), endLocat.Substring(6, 2));
                taskInfo = GetEndPai(endRoadWay.Substring(1, 2),endLocat.Substring(2, 2), endLocat.Substring(0, 2), endLocat.Substring(4, 2), endLocat.Substring(6, 2));
            }
            else                                                                    // 跨巷道移库，获取三楼出库口
            {
@@ -207,6 +208,114 @@
            }

        }
        //根据巷道口和层数确认出库工位排


        switch (roadWay)
        {
            case "R01":

                if (taskInfo.EndCeng == "1")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R02":

                if (taskInfo.EndCeng == "1")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R03":
                if (taskInfo.EndCeng == "1")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R04":
                if (taskInfo.EndCeng == "1")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R05":
                if (taskInfo.EndCeng == "1")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R06":
                if (taskInfo.EndCeng == "1" || taskInfo.EndCeng == "2" )
                {
                    taskInfo.EndPai = "2";
                }
                if ( taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R07":
                if (taskInfo.EndCeng == "1" )
                {
                    taskInfo.EndPai = "2";
                }
                if ( taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R08":
                if (taskInfo.EndCeng == "1")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R09":
                if (taskInfo.EndCeng == "1")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "2" || taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
            case "R10":
                if (taskInfo.EndCeng == "1" || taskInfo.EndCeng == "2")
                {
                    taskInfo.EndPai = "2";
                }
                if (taskInfo.EndCeng == "3")
                {
                    taskInfo.EndPai = "3";
                }
                break;
        }

        return taskInfo;
    }
@@ -219,7 +328,7 @@
    public static PLCUtil GetPlcIp(string startStation) 
    {
        string strIp = "";
        var conveyList1 = new List<string>() { "147", "145", "139", "137", "129", "127", "121", "119", "111", "109", "103", "101", "093", "091", "085", "083", "075", "073", "067", "065" };
        var conveyList1 = new List<string>() { "147", "145", "139", "137", "129", "127", "121", "119", "111", "109", "103", "101", "093", "091", "085", "083", "075", "073", "067", "065","033" };
        var conveyList2 = new List<string>() { "252", "254", "260", "262", "272", "272", "278", "280", "288", "290", "294", "301", "307", "309", "315", "317", "325", "327", "331", "337" };
        var conveyList3 = new List<string>() { "401", "402", "405", "406", "409", "410", "413", "414", "417", "418", "421", "422", "425", "426", "429", "430", "433", "434", "437", "438" };
        if (conveyList1.Contains(startStation))
@@ -247,15 +356,18 @@
    /// <summary>
    /// 根据wms目标地址转换为Plc目标地址
    /// </summary>
    /// <param name="road">巷道</param>
    /// <param name="lie">列</param>
    /// <param name="pai">排</param>
    /// <param name="ceng">层</param>
    /// <param name="dept">深度</param>
    /// <returns></returns>
    public static PlcTaskInfo GetEndPai(string lie, string pai,string ceng, string dept) 
    public static PlcTaskInfo GetEndPai(string road,string lie, string pai,string ceng, string dept) 
    {
        var roadNum = int.Parse(lie);
        var roadNum = int.Parse(road);
        var lieNum = int.Parse(lie);
        var paiNum = int.Parse(pai);
        var cengNum = int.Parse(ceng);
        var deptNum = int.Parse(dept);

        var paiVal = 0;
@@ -317,9 +429,9 @@
        }

        PlcTaskInfo taskInfo = new PlcTaskInfo();
        taskInfo.EndPai = pai;
        taskInfo.EndCeng = ceng;
        taskInfo.EndLie = paiVal.ToString();
        taskInfo.EndPai = paiVal.ToString();
        taskInfo.EndCeng = cengNum.ToString();
        taskInfo.EndLie = lieNum.ToString() ;

        return taskInfo;
    }