优先级

Zhang-Hong-Lin

2025-07-06 ac2920c6c36227646c03a38c76a335120b449817

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

@@ -78,7 +78,6 @@

        public Task Execute(IJobExecutionContext context)
        {
            Console.WriteLine("1");
            //return Task.CompletedTask;
            bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
            if (flag && value != null)
@@ -189,22 +188,22 @@
                    {
                        Dt_Task task = new Dt_Task();
                        var storagemode = _storagemodeRepository.QueryFirst(v => v.Id == 1);
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV上料模式，且东跨架子有上料信号

                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV上料模式，且西跨架子有上料信号
                        {
                            
                            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;
                                if (OHTJob.oHTReadData.R_DK_isready)
                                {
                                    task.Grade = 2;
                                    task.Grade = 3;
                                }
                                else
                                {
                                    task.Grade = 1;
                                    task.Grade = 2;
                                }
                                task.Remark = (int)MateTypeEnum.ZiChan;
                                //查找相邻的库位
@@ -228,7 +227,7 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV上料模式，且西跨架子有上料信号
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV上料模式，且东跨架子有上料信号
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
@@ -260,6 +259,9 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        


                        if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
@@ -270,11 +272,11 @@
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                if (OHTJob.oHTReadData.R_XK_isready)
                                {
                                    task.Grade = 2;
                                    task.Grade = 3;
                                }
                                else
                                {
                                    task.Grade = 1;
                                    task.Grade = 2;
                                }
                                task.Remark = (int)MateTypeEnum.WaiGou;
                                //查找相邻的库位
@@ -430,8 +432,7 @@
                        //查询当前需要出库的批次号，以及出库物料类型
                        var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1);
                        //查询库存物料库存信息
                        var stocks = _StockInfoRepository.QueryData(v => v.Remark == batch.materType && v.BatchNo == batch.OutBatch && v.StockStatus == 0)
                            .OrderBy(v => v.CreateDate).ToList();
                        var stocks = _StockInfoRepository.QueryData(v => v.Remark == batch.materType && v.BatchNo == batch.OutBatch && v.StockStatus == 0).OrderBy(v => v.CreateDate).ToList();
                        if (stocks.Count <= 0)
                        {
                            throw new Exception($"当前库存中没有【{batch.materType}】（0自产 1外购）且批次为【{batch.OutBatch}】的物料");