diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs index b9e933aa..88694039 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs @@ -484,8 +484,8 @@ namespace DS.WMS.Core.Op.Method x.RefundTag,x.RefundReason,x.RefundRemark,x.OrderProgress }).ExecuteCommandAsync(); - //任务交互表 提交退舱任务待处理流程变更为挂起 - var taskList = await tenantDb.Queryable().Where(x => x.BusinessId == req.Id && x.TaskStatus == TaskStatusEnum.Create).ToListAsync(); + //任务交互表 提交退舱任务待处理流程变更为挂起 11107排除退舱审核任务 + var taskList = await tenantDb.Queryable().Where(x => x.BusinessId == req.Id && x.TaskStatus == TaskStatusEnum.Create && x.TaskType != TaskBaseTypeEnum.RETURN_CABIN_AUDIT).ToListAsync(); if (taskList.IsNotNull() && taskList.Count > 0) { foreach (var item in taskList) @@ -495,7 +495,7 @@ namespace DS.WMS.Core.Op.Method await tenantDb.Updateable(taskList).ExecuteCommandAsync(); } //任务台主表 - var taskbaseList = await tenantDb.Queryable().Where(x => x.OUT_BS_NO == req.Id && x.STATUS == TaskStatusEnum.Create.ToString()).ToListAsync(); + var taskbaseList = await tenantDb.Queryable().Where(x => x.OUT_BS_NO == req.Id && x.STATUS == TaskStatusEnum.Create.ToString() && x.TASK_TYPE != TaskBaseTypeEnum.RETURN_CABIN_AUDIT.ToString()).ToListAsync(); if (taskbaseList.IsNotNull() && taskbaseList.Count > 0) { foreach (var item in taskbaseList) @@ -597,7 +597,7 @@ namespace DS.WMS.Core.Op.Method x.IsRefund, }).ExecuteCommandAsync(); //任务交互表 提交退舱任务待处理流程变更为取消 - var taskList = await tenantDb.Queryable().Where(x => x.BusinessId == callback.BusinessId).ToListAsync(); + var taskList = await tenantDb.Queryable().Where(x => x.BusinessId == callback.BusinessId && x.TaskStatus != TaskStatusEnum.Cancel).ToListAsync(); if (taskList.IsNotNull() && taskList.Count > 0) { foreach (var item in taskList) @@ -607,7 +607,7 @@ namespace DS.WMS.Core.Op.Method await tenantDb.Updateable(taskList).ExecuteCommandAsync(); } //任务台主表 - var taskbaseList = await tenantDb.Queryable().Where(x => x.OUT_BS_NO == callback.BusinessId).ToListAsync(); + var taskbaseList = await tenantDb.Queryable().Where(x => x.OUT_BS_NO == callback.BusinessId && x.STATUS != TaskStatusEnum.Cancel.ToString()).ToListAsync(); if (taskbaseList.IsNotNull() && taskbaseList.Count > 0) { foreach (var item in taskbaseList)