diff --git a/ds-wms-service/DS.WMS.Core/Check/View/VW_CheckBill_Detail.cs b/ds-wms-service/DS.WMS.Core/Check/View/VW_CheckBill_Detail.cs index a4d54536..25ec0527 100644 --- a/ds-wms-service/DS.WMS.Core/Check/View/VW_CheckBill_Detail.cs +++ b/ds-wms-service/DS.WMS.Core/Check/View/VW_CheckBill_Detail.cs @@ -40,7 +40,7 @@ namespace DS.WMS.Core.Check.View /// /// 业务状态 /// - public int BusinessStatus { get; set; } = 0; + public string BusinessStatus { get; set; } /// /// Desc:结算方式 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs index 07b43c7b..79ae0689 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs @@ -37,7 +37,7 @@ public class SeaExportReq /// /// 业务状态 /// - public int BusinessStatus { get; set; } + public string BusinessStatus { get; set; } ///// ///// 单据费用状态 diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs index 4af05483..1c292589 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs @@ -13,6 +13,10 @@ namespace DS.WMS.Core.Op.Dtos; /// public class SeaExportRes { + /// + /// 审单任务状态 + /// + public TaskStatusEnum OrderAuditTaskStatus { get; set; } /// /// Edi信息 /// @@ -66,7 +70,7 @@ public class SeaExportRes /// /// 业务状态 /// - public int BusinessStatus { get; set; } = 0; + public string BusinessStatus { get; set; } /// /// 业务状态名称 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index d0442d89..4288daba 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -16,6 +16,7 @@ using DS.WMS.Core.HangfireJob.Interface; using DS.WMS.Core.Info.Entity; using DS.WMS.Core.Op.Dtos; using DS.WMS.Core.Op.Entity; +using DS.WMS.Core.Op.Entity.TaskInteraction; using DS.WMS.Core.Op.Interface; using DS.WMS.Core.Sys.Entity; using DS.WMS.Core.Sys.Interface; @@ -786,7 +787,8 @@ public partial class SeaExportService : ISeaExportService .ToList(); it.OrderContactList = tenantDb.Queryable().Where(x => x.BusinessId == it.Id).Select().ToList(); - + //var businessTask = tenantDb.Queryable().Where(x => x.BusinessId == it.Id && x.TaskType == TaskBaseTypeEnum.WAIT_ORDER_AUDIT).First(); + //it.OrderAuditTaskStatus = businessTask.IsNull() ? TaskStatusEnum.Create : businessTask.TaskStatus; //it.DischargePortCountry = tenantDb.Queryable().Where(x => x.Id == it.DischargePortId).Select(x => x.CountryName).First(); }) diff --git a/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs b/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs index f0197cbc..8645693e 100644 --- a/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs +++ b/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs @@ -28,7 +28,7 @@ namespace DS.WMS.Core.Op.View /// /// 业务状态 /// - public int BusinessStatus { get; set; } = 0; + public string BusinessStatus { get; set; } ///// ///// 业务状态名称 ///// diff --git a/ds-wms-service/DS.WMS.Core/Op/View/VW_SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/View/VW_SeaExport.cs index 2e47110b..e603a965 100644 --- a/ds-wms-service/DS.WMS.Core/Op/View/VW_SeaExport.cs +++ b/ds-wms-service/DS.WMS.Core/Op/View/VW_SeaExport.cs @@ -26,7 +26,7 @@ namespace DS.WMS.Core.Op.View /// /// 业务状态 /// - public int BusinessStatus { get; set; } = 0; + public string BusinessStatus { get; set; } /// /// 业务状态名称 ///