diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportOpenEditReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportOpenEditReq.cs
index f25ce95a..abe31043 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportOpenEditReq.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportOpenEditReq.cs
@@ -15,7 +15,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 业务主键
         /// </summary>
-        public  long Id { get; set; }
+        public long Id { get; set; }
 
         /// <summary>
         /// 箱信息
@@ -24,7 +24,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 场站Id    t_crm_client CUSTNAME
         /// </summary>
-        public long YardId { get; set; }
+        public Nullable<long> YardId { get; set; }
         /// <summary>
         /// 场站    t_crm_client CUSTNAME
         /// </summary>
@@ -33,7 +33,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 船公司Id 
         /// </summary>
-        public long CarrierId { get; set; }
+        public Nullable<long> CarrierId { get; set; }
         /// <summary>
         /// 船公司 
         /// </summary>
@@ -41,7 +41,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 货代公司Id
         /// </summary>
-        public long ForwarderId { get; set; }
+        public Nullable<long> ForwarderId { get; set; }
         /// <summary>
         /// 货代公司
         /// </summary>
@@ -55,7 +55,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 航线Id 
         /// </summary>
-        public long LaneId { get; set; }
+        public Nullable<long> LaneId { get; set; }
 
         /// <summary>
         /// 航线 
@@ -64,7 +64,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 揽货人Id 
         /// </summary>
-        public long SaleId { get; set; }
+        public Nullable<long> SaleId { get; set; }
         /// <summary>
         /// 揽货人 
         /// </summary>
@@ -73,7 +73,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 报关行Id
         /// </summary>
-        public long CustomserId { get; set; }
+        public Nullable<long> CustomserId { get; set; }
         /// <summary>
         /// 报关行
         /// </summary>
@@ -82,7 +82,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 承运车队Id
         /// </summary>
-        public long TruckerId { get; set; }
+        public Nullable<long> TruckerId { get; set; }
         /// <summary>
         /// 承运车队
         /// </summary>
@@ -91,7 +91,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 装货港代码
         /// </summary>
-        public long LoadPortId { get; set; }
+        public Nullable<long> LoadPortId { get; set; }
 
         /// <summary>
         /// 装货港
@@ -101,7 +101,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 卸货港代码
         /// </summary>
-        public long DischargePortId { get; set; }
+        public Nullable<long> DischargePortId { get; set; }
 
         /// <summary>
         /// 卸货港
@@ -116,7 +116,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 船名Id
         /// </summary>
-        public long VesselId { get; set; }
+        public Nullable<long> VesselId { get; set; }
         /// <summary>
         /// 内部航次
         /// </summary>
@@ -129,7 +129,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 国外代理人Id    t_info_client CUSTNAME
         /// </summary>
-        public long? AgentId { get; set; }
+        public Nullable<long> AgentId { get; set; }
         /// <summary>
         /// 国外代理人    t_info_client CUSTNAME
         /// </summary>
@@ -143,21 +143,21 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// Desc:单证
         /// </summary>
-        public long Doc { get; set; }
+        public Nullable<long> Doc { get; set; }
 
         /// <summary>
         /// 客服
         /// </summary>
-        public long CustomerService { get; set; }
+        public Nullable<long> CustomerService { get; set; }
 
         /// <summary>
         /// 海外客服
         /// </summary>
-        public long ForeignCustomerService { get; set; }
+        public Nullable<long> ForeignCustomerService { get; set; }
         /// <summary>
         /// 操作员
         /// </summary>
-        public long OperatorId { get; set; }
+        public Nullable<long> OperatorId { get; set; }
         /// <summary>
         /// ATD
         /// </summary>
@@ -189,24 +189,24 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// Desc:业务来源Id
         /// </summary>
-        public long SourceId { get; set; }
+        public Nullable<long> SourceId { get; set; }
 
         /// <summary>
         /// Desc:业务来源明细Id
         /// </summary>
-        public long SourceDetailId { get; set; }
+        public Nullable<long> SourceDetailId { get; set; }
 
 
 
         /// <summary>
         /// 船代Id
         /// </summary>
-        public long ShipAgencyId { get; set; }
+        public Nullable<long> ShipAgencyId { get; set; }
 
         /// <summary>
         /// 船代
         /// </summary>
-        public long ShipAgency { get; set; }
+        public Nullable<long> ShipAgency { get; set; }
        
          
 
@@ -227,7 +227,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 交货地代码
         /// </summary>
-        public long DeliveryPlaceId { get; set; }
+        public Nullable<long> DeliveryPlaceId { get; set; }
 
         /// <summary>
         /// 交货地
@@ -244,7 +244,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 签单地点Id
         /// </summary>
-        public long IssuePlaceId { get; set; }
+        public Nullable<long> IssuePlaceId { get; set; }
 
         /// <summary>
         /// 签单地点
@@ -263,7 +263,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// Desc:所属业务部门
         /// </summary>
-        public long SaleDeptId { get; set; }
+        public Nullable<long> SaleDeptId { get; set; }
 
         /// <summary>
         /// 代理内容
@@ -278,7 +278,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 委托单位Id
         /// </summary>
-        public long CustomerId { get; set; }
+        public Nullable<long> CustomerId { get; set; }
         /// <summary>
         /// 委托单位    t_info_client CUSTNAME
         /// </summary>
@@ -291,7 +291,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 销售公司Id 
         /// </summary>
-        public long SaleOrgId { get; set; }
+        public Nullable<long> SaleOrgId { get; set; }
 
         /// <summary>
         /// 货物标识    S/R/D/O
@@ -317,36 +317,36 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// Desc:报检
         /// </summary>
-        public bool? IsInspection { get; set; } = false;
+        public bool? IsInspection { get; set; }
 
         /// <summary>
         /// Desc:仅报关
         /// </summary>
-        public bool? IsCustoms { get; set; } = false;
+        public bool? IsCustoms { get; set; }
 
         /// <summary>
         /// Desc:订舱
         /// </summary>
-        public bool? IsBooking { get; set; } = false;
+        public bool? IsBooking { get; set; }
         /// <summary>
         /// Desc:分单签单
         /// </summary>
-        public bool? IsHBLNO { get; set; } = false;
+        public bool? IsHBLNO { get; set; } 
 
         /// <summary>
         /// Desc:陆运
         /// </summary>
-        public bool? IsLand { get; set; } = false;
+        public bool? IsLand { get; set; }
 
         /// <summary>
         /// Desc:使用代理
         /// </summary>
-        public bool? IsAgent { get; set; } = false;
+        public bool? IsAgent { get; set; }
 
         /// <summary>
         /// Desc:仓储
         /// </summary>
-        public bool? IsStorage { get; set; } = false;
+        public bool? IsStorage { get; set; }
 
 
         /// <summary>
@@ -417,7 +417,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// <summary>
         /// 收货地点Id
         /// </summary>
-        public long ReceiptPlaceId { get; set; }
+        public Nullable<long> ReceiptPlaceId { get; set; }
 
         /// <summary>
         /// 截VGM时间
@@ -433,5 +433,6 @@ namespace DS.WMS.Core.Op.Dtos
         /// 主提单号
         /// </summary>
         public string MBLNO { get; set; }
+
     }
 }
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
index e7e64d20..5172db25 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
@@ -3085,13 +3085,16 @@ namespace DS.WMS.Core.Op.Method
                     CtnInfo = new List<OpCtnReq>()
                 };
 
-                if (bookingSlotBase.ETD.HasValue)
-                {
-                    bkModel.AccountDate = bookingSlotBase.ETD.Value.ToString("yyyy-MM");
-                }
-                else
+                if (!model.isOrderImport)
                 {
-                    bkModel.AccountDate = DateTime.Now.ToString("yyyy-MM");
+                    if (bookingSlotBase.ETD.HasValue)
+                    {
+                        bkModel.AccountDate = bookingSlotBase.ETD.Value.ToString("yyyy-MM");
+                    }
+                    else
+                    {
+                        bkModel.AccountDate = DateTime.Now.ToString("yyyy-MM");
+                    }
                 }
 
                 var ctnList = model.slots.SelectMany(b => b.CtnList).ToList();
diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs
index 90522747..15ab7164 100644
--- a/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs
+++ b/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Owin.Security.Provider;
 using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Ocsp;
 using SqlSugar;
 
 namespace DS.WMS.OpApi.Controllers
@@ -457,5 +458,33 @@ namespace DS.WMS.OpApi.Controllers
            return  await _bookingSlotStockService.BookingSlotStock(model);
         }
         #endregion
+
+        #region 保存舱位预甩或换舱
+        /// <summary>
+        /// 保存舱位预甩或换舱
+        /// </summary>
+        /// <param name="req">请求详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost]
+        [Route("SaveRolling")]
+        public async Task<DataResult> SaveRolling([FromBody] BookingSlotRollingDto req)
+        {
+            return await _bookingSlotService.SaveRolling(req);
+        }
+        #endregion
+
+        #region 获取舱位预甩或换舱列表
+        /// <summary>
+        /// 获取舱位预甩或换舱列表
+        /// </summary>
+        /// <param name="slotId">舱位ID</param>
+        /// <returns>返回列表</returns>
+        [HttpGet]
+        [Route("GetRollingList")]
+        public async Task<DataResult<List<BookingSlotRollingDto>>> GetRollingList([FromQuery] long slotId)
+        {
+            return await _bookingSlotService.GetRollingList(slotId);
+        }
+        #endregion
     }
 }