修改问题

Administrator

2025-05-30 aa76e0acd1337d82ddef1d5a34b245c988ecfc13

修改问题

 Admin.NET/WCS.Application/Enum/FourWayCarEnum.cs

@@ -76,12 +76,12 @@
    /// 极限电量 低于此电量不执行任务
    /// </summary>
    [Description("极限电量")]
    Dl = 10,
    Dl = 20,
    /// <summary>
    /// 健康电量 低于此电量 且无任务时去充电
    /// </summary>
    [Description("健康电量")]
    Dl2 = 15,
    Dl2 = 75,
    

}

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

@@ -338,11 +338,11 @@
                            var endLocateCar = "";
                            if (valuez == 1)
                            {
                                endLocateCar = "210401";
                                endLocateCar = "011201";
                            }
                            else if (valuez == 2)
                            {
                                endLocateCar = "210402"; //011202
                                endLocateCar = "011202"; //
                            }
                            else
                            {
@@ -352,7 +352,7 @@
                            if (getCdTask == null)
                            {
                                var (resultDlLock, valueDlLock) = plcConn.GetDBValue(modDevice.PosType, modDevice.PlcPos);
                                if (resultDlLock.IsSucceed && valueDlLock!=3)
                                if (resultDlLock.IsSucceed && valueDlLock!=3 && carXYZ != endLocateCar)
                                {
                                    //添加小车充电位置
                                    WcsTask modCarTask = new WcsTask()
@@ -405,11 +405,11 @@
                                        var endLocateCar = "";
                                        if (valuez == 1)
                                        {
                                            endLocateCar = "210401";
                                            endLocateCar = "011201";
                                        }
                                        else if (valuez == 2)
                                        {
                                            endLocateCar = "210402";
                                            endLocateCar = "011202";
                                        }
                                        else
                                        {
@@ -419,7 +419,7 @@
                                        if (getCdTask == null)
                                        {
                                            var (resultDlLock, valueDlLock) = plcConn.GetDBValue(modDevice.PosType, modDevice.PlcPos);
                                            if (resultDlLock.IsSucceed && valueDlLock != 3)
                                            if (resultDlLock.IsSucceed && valueDlLock != 3 && carXYZ != endLocateCar)
                                            {
                                                //添加小车充电位置
                                                WcsTask modCarTask = new WcsTask()

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

@@ -332,7 +332,7 @@



                        Thread.Sleep(500);
                        Thread.Sleep(5000);
                    }
                    catch (OperationCanceledException)
                    {

 Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs

@@ -26,6 +26,7 @@
    private readonly IHubContext<TaskLogHub, ITaskLogHub> _taskLogHubContext;
    private readonly SqlSugarRepository<WcsCheckTask> _wcsCheckTaskRep;
    private readonly SqlSugarRepository<WcsMateialPzInfo> _wcsMateialPzInfoRep;
    private readonly object _lockObj = new object();

    public WcsTaskService(SqlSugarRepository<WcsTask> wcsTaskRep, IHubContext<TaskLogHub, ITaskLogHub> taskLogHubContext, SqlSugarRepository<WcsCheckTask> wcsCheckTaskRep, SqlSugarRepository<WcsMateialPzInfo> wcsMateialPzInfoRep)
    {
@@ -440,31 +441,35 @@
    [NonAction]
    public string GetTaskCode(string codeFlag = "WCS")
    {
        var list = _db.Queryable<WcsTask>().Where(m => m.TaskNo.StartsWith("WCS")).ToList();
        string maxNo = list.Max(m => m.TaskNo);
        if (!string.IsNullOrEmpty(maxNo))
        lock (_lockObj)
        {
            maxNo = maxNo.Substring(codeFlag.Length);
        }
        //获取数据库时间八位
        string date = DateTime.Now.ToString("yyyyMMdd").Trim();
        string no = "";
        if (string.IsNullOrEmpty(maxNo))
        {
            no = codeFlag + date + "0001";
        }
        else
        {
            if (maxNo.Length == 12 && maxNo.Substring(0, 8) == date)
            var list = _db.Queryable<WcsTask>().Where(m => m.TaskNo.StartsWith("WCS")).ToList();
            string maxNo = list.Max(m => m.TaskNo);
            if (!string.IsNullOrEmpty(maxNo))
            {
                int lastNo = Convert.ToInt32(maxNo.Substring(8, 4)) + 1;
                no = codeFlag + date + (lastNo.ToString().PadLeft(4, '0'));
                maxNo = maxNo.Substring(codeFlag.Length);
            }
            else
            //获取数据库时间八位
            string date = DateTime.Now.ToString("yyyyMMdd").Trim();
            string no = "";
            if (string.IsNullOrEmpty(maxNo))
            {
                no = codeFlag + date + "0001";
            }
            else
            {
                if (maxNo.Length == 12 && maxNo.Substring(0, 8) == date)
                {
                    int lastNo = Convert.ToInt32(maxNo.Substring(8, 4)) + 1;
                    no = codeFlag + date + (lastNo.ToString().PadLeft(4, '0'));
                }
                else
                {
                    no = codeFlag + date + "0001";
                }
            }
            return no;
        }
        return no;
        
    }
}

 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";
            }