Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJ...

Zhang-Hong-Lin

2025-03-07 6513c35280f2283ff53b36bdc0c9d83aba475f8d

Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJiPingKu

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -80,6 +80,6 @@
        /// å¤©è½¦ç§»åŠ¨
        /// </summary>
        [Description("天车移动")]
        Mowe = 100,
        Mowe = 300,
    }
}
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -19,8 +19,8 @@
    //连接字符串
    //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
    //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_TEST555;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
    //"ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=123456;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
    "ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
    "ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=123456;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
    //"ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",




 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -263,7 +263,8 @@
                    //优先返回执行到一半的任务继续执行
                    return task;
                }
                else {
                else 
                {
                    //查询天车移动任务
                    task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
                    if (task!=null)
@@ -277,17 +278,22 @@
                //{
                //    throw new Exception($"当前任务池中存在执行中的任务,任务号:【{task.TaskNum}】");
                //}
                if (task.TaskState!= (int)TaskMoveStatusEnum.OutNewMove)
                //if (task != null)
                //{
                //    if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
                //    {
                       
                //    }
                //}
                if (workTpe.Equals("In"))
                {
                    if (workTpe.Equals("In"))
                    {
                        task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
                    }
                    else if (workTpe.Equals("Out"))
                    {
                        task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                    }
                    task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
                }
                else if (workTpe.Equals("Out"))
                {
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                }

            }
            catch (Exception)
            {
@@ -445,7 +451,7 @@
                {
                    task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
                }
                else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
                {
                    task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
                }
@@ -597,6 +603,8 @@
                {
                    throw new Exception(string.Format("天车放货完成任务未查询到任务号{0}", taskNum));
                }
                
                
                if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
                {
                    var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
@@ -648,6 +656,7 @@
                    taskhty.PalletCode = nawtask.PalletCode;
                    taskhty.NextAddress = nawtask.NextAddress;
                    taskhty.CurrentAddress = nawtask.CurrentAddress;
                    
                    //开始数据库事务
                    _unitOfWorkManage.BeginTran();
                    _stockRepository.AddData(stock);
@@ -689,8 +698,24 @@
                    taskhty.PalletCode = nawtask.PalletCode;
                    taskhty.NextAddress = nawtask.NextAddress;
                    taskhty.CurrentAddress = nawtask.CurrentAddress;
                    //如果放货位置行是40，则立马生成一条移动任务
                    //开始创建任务
                    Dt_Task Movstask = new Dt_Task();
                    Movstask.Roadway = "TC01";
                    Movstask.TaskType = (int)TaskMoveEnum.Mowe;
                    Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
                    Movstask.SourceAddress = "0";
                    Movstask.TargetAddress = "1-5-1";
                    Movstask.NextAddress = "text";
                    Movstask.Grade = 1;
                    Movstask.WMSId = 3;
                    Movstask.Remark = 0;
                    Movstask.PalletCode = "text";
                    Movstask.CurrentAddress = "text";
                    //开始数据库事务
                    
                    _unitOfWorkManage.BeginTran();
                    BaseDal.AddData(Movstask);
                    _stockRepository.DeleteData(stock);
                    _stockRepository.DeleteData(Towstock);
                    _locationRepository.UpdateData(location);
@@ -717,12 +742,38 @@
                    taskhty.PalletCode = nawtask.PalletCode;
                    taskhty.NextAddress = nawtask.NextAddress;
                    taskhty.CurrentAddress = nawtask.CurrentAddress;
                    //开始数据库事务
                    _unitOfWorkManage.BeginTran();
                    _taskhtyRepository.AddData(taskhty);
                    BaseDal.DeleteData(nawtask);
                    //提交事务
                    _unitOfWorkManage.CommitTran();
                    if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                    {
                        //开始创建任务
                        Dt_Task Movstask = new Dt_Task();
                        Movstask.Roadway = "TC01";
                        Movstask.TaskType = (int)TaskMoveEnum.Mowe;
                        Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
                        Movstask.SourceAddress = "0";
                        Movstask.TargetAddress = "1-5-1";
                        Movstask.NextAddress = "text";
                        Movstask.Grade = 1;
                        Movstask.WMSId = 3;
                        Movstask.Remark = 0;
                        Movstask.PalletCode = "text";
                        Movstask.CurrentAddress = "text";
                        //开始数据库事务
                        _unitOfWorkManage.BeginTran();
                        BaseDal.AddData(Movstask);
                        _taskhtyRepository.AddData(taskhty);
                        BaseDal.DeleteData(nawtask);
                        //提交事务
                        _unitOfWorkManage.CommitTran();
                    }
                    else
                    {
                        //开始数据库事务
                        _unitOfWorkManage.BeginTran();
                        _taskhtyRepository.AddData(taskhty);
                        BaseDal.DeleteData(nawtask);
                        //提交事务
                        _unitOfWorkManage.CommitTran();
                    }
                }
                content = WebResponseContent.Instance.OK();
            }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs

@@ -85,22 +85,23 @@
                try
                {
                    #region ç”Ÿæˆå…¥åº“任务
                    if (!OHTJob.oHTReadData.R_GZJ_isWork)
                    {
                        throw new Exception($"规整机投入使用信号为false");
                    }
                    //if (!OHTJob.oHTReadData.R_GZJ_isWork)
                    //{
                    //    throw new Exception($"规整机投入使用信号为false");
                    //}
                    var Inisout = _outStockRepository.QueryFirst(v => v.Id == 1);
                    //入库
                    if (Inisout.InOut==1)
                    {
                        Dt_Task task = new Dt_Task();
                        var storagemode = _storagemodeRepository.QueryFirst(v => v.Id == 1);
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV上料模式，且东跨架子有上料信号
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV上料模式，且东跨架子有上料信号
                        {
                            
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
                            var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                            if (oldhtytask !=null) 
                            if (oldhtytask ==null) 
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                task.Grade = 1;
@@ -126,15 +127,15 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV上料模式，且西跨架子有上料信号
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV上料模式，且西跨架子有上料信号
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
                            var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                            if (oldhtytask!=null)
                            if (oldhtytask==null)
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                var DKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                                var DKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                                string address = DKstation.Row + "-" + DKstation.Column + "-1";
                                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address);
                                if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew)
@@ -167,12 +168,12 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//人工叉车上料模式，且西跨架子有上料信号
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//人工叉车上料模式，且西跨架子有上料信号
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
                            var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                            if (oldhtytask!=null)
                            if (oldhtytask==null)
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                task.Grade = 1;
@@ -198,15 +199,15 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//人工叉车上料模式，且东跨架子有上料信号
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//人工叉车上料模式，且东跨架子有上料信号
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
                            var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                            if (true)
                            if (oldhtytask == null)
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                                var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                                string address = XKstation.Row + "-" + XKstation.Column + "-1";
                                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address);
                                if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew)
@@ -241,6 +242,7 @@
                        }
                        
                    }
                    //直接出库
                    else if(Inisout.InOut == 2)
                    {
                        if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork)
@@ -248,15 +250,22 @@
                            throw new Exception($"整形机不属于天车上料模式或天车放板信号为false");
                        }
                        Dt_Task outtask = new Dt_Task();
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready )
                        //小车上料
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready )
                        {
                            var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";

                        }
                        else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)
                        else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)
                        {
                            var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
                        }
                        //人工上料
                        else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
                        {
                            var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
                        }
                        else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)
@@ -264,13 +273,9 @@
                            var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
                        }
                        else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
                        {
                            var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
                        }
                        
                        var Endstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "整形机放料位");
                        //添加任务信息
                        outtask.TargetAddress = Endstation.Row + "-" + Endstation.Column + "-1";
                        outtask.Grade = 1;
                        outtask.NextAddress = Endstation.Row + "-" + Endstation.Column + "-1";
@@ -280,9 +285,11 @@
                        outtask.WMSId = 3;
                        outtask.PalletCode = "text";
                        outtask.CurrentAddress = "text";
                        var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == outtask.SourceAddress &&v.TargetAddress== outtask.SourceAddress);
                        //防止重复任务
                        var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == outtask.SourceAddress &&v.TargetAddress== outtask.TargetAddress);
                        if (oldtask == null) 
                        {
                            //生成任务
                            _dt_taskRepositiry.AddData(outtask);
                        }
                    }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs

@@ -54,10 +54,10 @@
                var ZXJdevice = Storage.Devices.Find(v => v.DeviceName == "阳极整形机");
                //规整机PLC对象
                var GZJevice = Storage.Devices.Find(v => v.DeviceName == "阳极规整机");
                if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
                {
                    return Task.CompletedTask;
                }
                //if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
                //{
                //    return Task.CompletedTask;
                //}
                try
                {
                    #region å¤©è½¦å®Œæˆä»»åŠ¡é€»è¾‘
@@ -71,11 +71,13 @@
                        {
                            throw new Exception(string.Format("天车取货完成任务未查询到任务号{0}", oHTReadData.R_TaskNumber));
                        }
                        //入库
                        if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
                        {
                            //如果任务的状态是天车入库取货执行中
                            //如果任务的状态是否是天车入库取货执行中
                            if (nawtask.TaskState == (int)TaskInStatusEnum.Line_InGrabExecuting)
                            {
                                //修改状态
                                WebResponseContent result = _taskService.UpdateTaskStatusToLine_Ingrab(nawtask);
                                if (result.Status)
                                {
@@ -83,11 +85,13 @@
                                }
                            }
                        }
                        //出库
                        else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                        {
                            //如果任务状态是天车出库取货执行中
                            //如果任务状态是否是天车出库取货执行中
                            if (nawtask.TaskState == (int)TaskOutStatusEnum.Line_OutGrabExecuting)
                            {
                                //修改状态
                                WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
                                if (result.Status)
                                {
@@ -95,8 +99,10 @@
                                }
                            }
                        }
                        //直接出库
                        else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                        {
                            //修改状态
                            WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
                            if (result.Status)
                            {

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs

@@ -138,7 +138,9 @@
                {
                    //查找相邻的库位
                    Dt_LocationInfo Towlocation = new Dt_LocationInfo();

                    var Onelocation = BaseDal.QueryFirst(v => v.LocationCode == location.LocationCode);

                    if (Onelocation.Depth == 1)
                    {
                        Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);