修改问题

IPC-610

2024-10-30 8ea7380ee486d842bdd96824ac490ba53b454b58

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

@@ -1,4 +1,5 @@
using Elastic.Clients.Elasticsearch.Tasks;
using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
using RazorEngine.Compilation.ImpromptuInterface.Dynamic;
using System;
@@ -354,13 +355,13 @@
    }

    /// <summary>
    /// 根据wms目标地址转换为Plc目标地址
    /// 根据wms目标地址转换为Plc目标地址   03010301
    /// </summary>
    /// <param name="road">巷道</param>
    /// <param name="lie">列</param>
    /// <param name="pai">排</param>
    /// <param name="road">巷道02</param>
    /// <param name="lie">列01</param>
    /// <param name="pai">排03</param>
    /// <param name="ceng">层</param>
    /// <param name="dept">深度</param>
    /// <param name="dept">深度01</param>
    /// <returns></returns>
    public static PlcTaskInfo GetEndPai(string road,string lie, string pai,string ceng, string dept) 
    {
@@ -372,35 +373,35 @@

        var paiVal = 0;
        // 判断巷道奇偶数
        if (roadNum % 2 == 0)// 偶数
        {
            // 判断排奇偶数
            if (paiNum % 2 == 0)
            {
                if (deptNum == 1)
                {
                    paiVal = 3;
                }
                else
                {
                    paiVal = 4;
                }
            }
            else
            {
                if (deptNum == 1)
                {
                    paiVal = 1;
                }
                else
                {
                    paiVal = 2;
                }
            }
        //if (roadNum % 2 == 0)// 偶数
        //{
        //    // 判断排奇偶数
        //    if (paiNum % 2 == 0)
        //    {
        //        if (deptNum == 1)
        //        {
        //            paiVal = 3;
        //        }
        //        else
        //        {
        //            paiVal = 4;
        //        }
        //    }
        //    else
        //    {
        //        if (deptNum == 1)
        //        {
        //            paiVal = 2;
        //        }
        //        else
        //        {
        //            paiVal = 1;
        //        }
        //    }

        }
        else   // 奇数
        {
        //}
        //else   // 奇数
        //{
            // 判断排奇偶数
            if (paiNum % 2 == 0)
            {
@@ -426,7 +427,7 @@

                }
            }
        }
        //}

        PlcTaskInfo taskInfo = new PlcTaskInfo();
        taskInfo.EndPai = paiVal.ToString();
@@ -812,11 +813,11 @@


    /// <summary>
    /// 根据储位排获取跺机对应的地址排
    /// 根据储位排获取跺机对应的地址排03010302
    /// </summary>
    /// <param name="road">排</param>
    /// <param name="pai">排</param>
    /// <param name="dept">深度</param>
    /// <param name="road">排02</param>
    /// <param name="pai">排03</param>
    /// <param name="dept">深度02</param>
    /// <returns></returns>
    public static int GetDjAdress(string road, string pai, string dept)
    {
@@ -825,36 +826,36 @@
        var deptNum = int.Parse(dept);

        var paiVal = 0;
        // 判断巷道奇偶数
        if (roadNum % 2 == 0)// 偶数
        {
            // 判断排奇偶数
            if (paiNum % 2 == 0)
            {
                if (deptNum == 1)
                {
                    paiVal = 3;
                }
                else
                {
                    paiVal = 4;
                }
            }
            else
            {
                if (deptNum == 1)
                {
                    paiVal = 1;
                }
                else
                {
                    paiVal = 2;
                }
            }
        //// 判断巷道奇偶数
        //if (roadNum % 2 == 0)// 偶数
        //{
        //    // 判断排奇偶数
        //    if (paiNum % 2 == 0)
        //    {
        //        if (deptNum == 1)
        //        {
        //            paiVal = 3;
        //        }
        //        else
        //        {
        //            paiVal = 4;
        //        }
        //    }
        //    else
        //    {
        //        if (deptNum == 1)
        //        {
        //            paiVal = 2;
        //        }
        //        else
        //        {
        //            paiVal = 1;
        //        }
        //    }

        }
        else   // 奇数
        {
        //}
        //else   // 奇数
        //{
            // 判断排奇偶数
            if (paiNum % 2 == 0)
            {
@@ -880,9 +881,10 @@

                }
            }
        }
        //}
        if (paiVal == 0)
        {
            Log.Error("排转换失败!");
            throw new Exception("排转换失败");
        }
        return paiVal;