海运出口字段修改

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs

@@ -710,12 +710,12 @@ public class SeaExportReq
     /// <summary>
     /// 截单日期
     /// </summary>
-    public DateTime CloseDocDate { get; set; }
+    public DateTime? CloseDocDate { get; set; }
 
     /// <summary>
     /// 集港日期
     /// </summary>
-    public DateTime IntoPortDocDate { get; set; }
+    public DateTime? IntoPortDocDate { get; set; }
 
     /// <summary>
     /// Desc:所属业务部门
@@ -736,7 +736,7 @@ public class SeaExportReq
     /// <summary>
     /// Desc:月结算时间
     /// </summary>
-    public DateTime StlDate { get; set; }
+    public DateTime? StlDate { get; set; }
 
     /// <summary>
     /// Desc:委托方式
@@ -848,7 +848,7 @@ public class SeaExportReq
     /// <summary>
     /// Desc: 报关日期
     /// </summary>
-    public DateTime CustomDate { get; set; }
+    public DateTime? CustomDate { get; set; }
 
     /// <summary>
     /// 单位编码 
@@ -868,7 +868,7 @@ public class SeaExportReq
     /// <summary>
     /// Desc:商检日期
     /// </summary>
-    public DateTime InspectionDate { get; set; }
+    public DateTime? InspectionDate { get; set; }
 
     /// <summary>
     /// Desc:贸易条款

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs

@@ -25,7 +25,7 @@ public class SeaExport : BaseOrgModel<long>
     /// <summary>
     /// 业务状态名称
     /// </summary>
-    [SqlSugar.SugarColumn(ColumnDescription = "业务状态名称", IsNullable = false, Length = 50)]
+    [SqlSugar.SugarColumn(ColumnDescription = "业务状态名称", IsNullable = true, Length = 50)]
     public string BusinessStatusName { get; set; }
     /// <summary>
     /// 单据费用状态
@@ -35,7 +35,7 @@ public class SeaExport : BaseOrgModel<long>
     /// <summary>
     /// 单据费用状态名称
     /// </summary>
-    [SqlSugar.SugarColumn(ColumnDescription = "单据费用状态名称", IsNullable = false, Length = 50)]
+    [SqlSugar.SugarColumn(ColumnDescription = "单据费用状态名称", IsNullable = true, Length = 50)]
     public string BillFeeStatusName { get; set; }
     /// <summary>
     /// 单据费用状态时间

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -2597,6 +2597,7 @@ public class SeaExportService : ISeaExportService
         if (order.ParentId == 0)
             return DataResult<string>.Failed($"获取当前订单为分单不能生成EDI信息");
 
+        var orderEDI = tenantDb.Queryable<SeaExportEdi>().First(x => x.BusinessId == req.Id);
         _logger.Info("批次={no}提取订单信息完成", batchNo);
 
         var ediExtModel = tenantDb.Queryable<SeaExportEdi>().First(x => x.BusinessId == req.Id);
@@ -2761,8 +2762,9 @@ public class SeaExportService : ISeaExportService
 
         ediModel.BSLIST = new List<SeaExportEDIBaseModel>();
 
-        //TODO
+        //TODO 数据映射
         var primaryModel = order.Adapt<SeaExportEDIBaseModel>();
+        primaryModel = orderEDI.Adapt<SeaExportEDIBaseModel>();
 
         //航次取内部航次号 2023-04-03 合川操作确认这样调整
         primaryModel.VOYNO = order.InnerVoyno;

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"
+      ]
+    }
+  }
+}