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 9e7e246c..e177adc6 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs @@ -710,12 +710,12 @@ public class SeaExportReq /// /// 截单日期 /// - public DateTime CloseDocDate { get; set; } + public DateTime? CloseDocDate { get; set; } /// /// 集港日期 /// - public DateTime IntoPortDocDate { get; set; } + public DateTime? IntoPortDocDate { get; set; } /// /// Desc:所属业务部门 @@ -736,7 +736,7 @@ public class SeaExportReq /// /// Desc:月结算时间 /// - public DateTime StlDate { get; set; } + public DateTime? StlDate { get; set; } /// /// Desc:委托方式 @@ -848,7 +848,7 @@ public class SeaExportReq /// /// Desc: 报关日期 /// - public DateTime CustomDate { get; set; } + public DateTime? CustomDate { get; set; } /// /// 单位编码 @@ -868,7 +868,7 @@ public class SeaExportReq /// /// Desc:商检日期 /// - public DateTime InspectionDate { get; set; } + public DateTime? InspectionDate { get; set; } /// /// Desc:贸易条款 diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs index f9bf7058..07e9c84f 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs @@ -25,7 +25,7 @@ public class SeaExport : BaseOrgModel /// /// 业务状态名称 /// - [SqlSugar.SugarColumn(ColumnDescription = "业务状态名称", IsNullable = false, Length = 50)] + [SqlSugar.SugarColumn(ColumnDescription = "业务状态名称", IsNullable = true, Length = 50)] public string BusinessStatusName { get; set; } /// /// 单据费用状态 @@ -35,7 +35,7 @@ public class SeaExport : BaseOrgModel /// /// 单据费用状态名称 /// - [SqlSugar.SugarColumn(ColumnDescription = "单据费用状态名称", IsNullable = false, Length = 50)] + [SqlSugar.SugarColumn(ColumnDescription = "单据费用状态名称", IsNullable = true, Length = 50)] public string BillFeeStatusName { 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 29c6f78c..73e79f92 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -2597,6 +2597,7 @@ public class SeaExportService : ISeaExportService if (order.ParentId == 0) return DataResult.Failed($"获取当前订单为分单不能生成EDI信息"); + var orderEDI = tenantDb.Queryable().First(x => x.BusinessId == req.Id); _logger.Info("批次={no}提取订单信息完成", batchNo); var ediExtModel = tenantDb.Queryable().First(x => x.BusinessId == req.Id); @@ -2761,8 +2762,9 @@ public class SeaExportService : ISeaExportService ediModel.BSLIST = new List(); - //TODO + //TODO 数据映射 var primaryModel = order.Adapt(); + primaryModel = orderEDI.Adapt(); //航次取内部航次号 2023-04-03 合川操作确认这样调整 primaryModel.VOYNO = order.InnerVoyno; diff --git a/ds-wms-service/DS.WMS.FeeApi/.config/dotnet-tools.json b/ds-wms-service/DS.WMS.FeeApi/.config/dotnet-tools.json new file mode 100644 index 00000000..93ec8eb6 --- /dev/null +++ b/ds-wms-service/DS.WMS.FeeApi/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "8.0.5", + "commands": [ + "dotnet-ef" + ] + } + } +} \ No newline at end of file