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

Zhang-Hong-Lin

2025-03-09 9d34ec27aa5bb9310abd23c6f542b6e4e79a3637

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

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

@@ -5,6 +5,7 @@
using Microsoft.Extensions.Hosting;
using Microsoft.VisualBasic.FileIO;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using Quartz;
using SixLabors.ImageSharp.PixelFormats;
using System;
@@ -104,10 +105,7 @@
                            if (oldhtytask ==null) 
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                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)
                                if (OHTJob.oHTReadData.R_DK_isready)
                                {
                                    task.Grade = 2;
                                }
@@ -169,7 +167,7 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//人工叉车上料模式，且西跨架子有上料信号
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
@@ -177,10 +175,7 @@
                            if (oldhtytask==null)
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                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)
                                if (OHTJob.oHTReadData.R_XK_isready)
                                {
                                    task.Grade = 2;
                                }
@@ -188,7 +183,6 @@
                                {
                                    task.Grade = 1;
                                }
                                task.Grade = 1;
                                task.Remark = (int)MateTypeEnum.WaiGou;
                                //查找相邻的库位
                                Dt_LocationInfo Towlocation = new Dt_LocationInfo();
@@ -211,7 +205,7 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//人工叉车上料模式，且东跨架子有上料信号
                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
@@ -219,6 +213,17 @@
                            if (oldhtytask == null)
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                //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)
                                //{
                                //    task.Grade = 2;
                                //}
                                //else
                                //{
                                //    task.Grade = 1;
                                //}
                                task.Grade = 1;
                                task.Remark = (int)MateTypeEnum.WaiGou;
                                //查找相邻的库位
@@ -242,14 +247,17 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        
                    }
                    //直接出库
                    else if(Inisout.InOut == 2)
                    {
                        if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork)
                        if (!OHTJob.oHTReadData.R_ZXJ_TCMode)
                        {
                            throw new Exception($"整形机不属于天车上料模式或天车放板信号为false");
                        }
                        if (!OHTJob.oHTReadData.R_HC_isReadyWork)
                        {
                            throw new Exception($"整形机天车放板信号为false");
                        }
                        Dt_Task outtask = new Dt_Task();
                        //小车上料
@@ -312,10 +320,14 @@
                    var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
                    if (isout.isout == 1)
                    {
                        if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork)
                        if (!OHTJob.oHTReadData.R_ZXJ_TCMode )
                        {
                            throw new Exception($"整形机不属于天车上料模式或天车放板信号为false");
                        }
                        if (!OHTJob.oHTReadData.R_HC_isReadyWork)
                        {
                            throw new Exception($"整形机天车放板信号为false");
                        }
                        //查询当前任务池中是否存在出库任务，出库任务只能存在一条
                        var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
                        if (oldtask != null)