From 232cdf071bfe3bd2b77ba05accba89b67fcc1edc Mon Sep 17 00:00:00 2001 From: Zhang-Hong-Lin <a3219986988@163.com> Date: 星期四, 26 六月 2025 18:51:14 +0800 Subject: [PATCH] 优化bug与添加一键删除按钮 --- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs | 86 ++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 42 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs" index cd5b34c..84b2514 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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,7 +188,46 @@ { 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 == "瑗胯法鏋跺瓙"); + task.SourceAddress = station.Row + "-" + station.Column + "-1"; + var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress); + if (oldhtytask == null) + { + task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; + if (OHTJob.oHTReadData.R_DK_isready) + { + task.Grade = 3; + } + else + { + task.Grade = 2; + } + task.Remark = (int)MateTypeEnum.ZiChan; + //鏌ユ壘鐩搁偦鐨勫簱浣� + Dt_LocationInfo Towlocation = new Dt_LocationInfo(); + var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress); + if (Onelocation.Depth == 1) + { + Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2); + } + else + { + Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1); + } + task.NextAddress = Towlocation.LocationCode; + task.Roadway = "TC01"; + task.TaskType = (int)TaskInboundTypeEnum.Inbound; + task.TaskState = (int)TaskInStatusEnum.InNew; + task.PalletCode = "text"; + task.CurrentAddress = "text"; + task.WMSId = 3; + _dt_taskRepositiry.AddData(task); + } + } + 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"; @@ -221,45 +259,9 @@ _dt_taskRepositiry.AddData(task); } } - 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) - { - task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; - if (OHTJob.oHTReadData.R_DK_isready) - { - task.Grade = 2; - } - else - { - task.Grade = 1; - } - task.Remark = (int)MateTypeEnum.ZiChan; - //鏌ユ壘鐩搁偦鐨勫簱浣� - Dt_LocationInfo Towlocation = new Dt_LocationInfo(); - var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress); - if (Onelocation.Depth == 1) - { - Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2); - } - else - { - Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1); - } - task.NextAddress = Towlocation.LocationCode; - task.Roadway = "TC01"; - task.TaskType = (int)TaskInboundTypeEnum.Inbound; - task.TaskState = (int)TaskInStatusEnum.InNew; - task.PalletCode = "text"; - task.CurrentAddress = "text"; - task.WMSId = 3; - _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; //鏌ユ壘鐩搁偦鐨勫簱浣� -- Gitblit v1.9.3