Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

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

@@ -13,7 +13,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 订舱合约号管理
     /// </summary>
     [SqlSugar.SugarTable("booking_contract_manage", "订舱合约号管理")]
-    public class BookingContractNoManage : BaseModelV2<long>
+    public class BookingContractNoManage : BaseModel<long>
     {
         /// <summary>
         /// 合约号编号

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

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 订舱标签表
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_label", "订舱标签表")]
-    public class BookingLabel : BaseModelV2<long>
+    public class BookingLabel : BaseModel<long>
     {
         /// <summary>
         /// 标签名称

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

@@ -10,8 +10,8 @@ namespace DS.WMS.Core.Op.Entity
     /// <summary>
     /// 订舱标签关联表
     /// </summary>
-    [SqlSugar.SugarTable("booking_label_allocation", "订舱标签关联表")]
-    public class BookingLabelAllocation : BaseModelV2<long>
+    [SqlSugar.SugarTable("op_sea_booking_label_allocation", "订舱标签关联表")]
+    public class BookingLabelAllocation : BaseModel<long>
     {
         /// <summary>
         /// 标签主键

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

@@ -12,7 +12,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 舱位分配表
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_allocation", "舱位分配表")]
-    public class BookingSlotAllocation : BaseModelV2<long>
+    public class BookingSlotAllocation : BaseModel<long>
     {
         /// <summary>
         /// 舱位主键

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

@@ -12,7 +12,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 舱位分配集装箱表
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_allocation_ctn", "舱位分配集装箱表")]
-    public class BookingSlotAllocationCtn : BaseModelV2<long>
+    public class BookingSlotAllocationCtn : BaseModel<long>
     {
         /// <summary>
         /// 舱位分配主键

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

@@ -13,7 +13,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 舱位管理主信息
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_base", "舱位管理主信息")]
-    public class BookingSlotBase : BaseModelV2<long>
+    public class BookingSlotBase : BaseModel<long>
     {
         /// <summary>
         /// 舱位提单号

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

@@ -13,7 +13,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 舱位变更比对记录表
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_compare", "舱位变更比对记录表")]
-    public class BookingSlotCompare : BaseModelV2<long>
+    public class BookingSlotCompare : BaseModel<long>
     {
         /// <summary>
         /// 舱位主键

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

@@ -12,7 +12,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 舱位集装箱管理
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_ctn", "舱位集装箱管理")]
-    public class BookingSlotCtn : BaseModelV2<long>
+    public class BookingSlotCtn : BaseModel<long>
     {
         /// <summary>
         /// 舱位主键

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

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Op.Entity.BookingSlot
     /// 舱位分配表
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_demand", "舱位分配表")]
-    public class BookingSlotDemand : BaseModelV2<long>
+    public class BookingSlotDemand : BaseModel<long>
     {
         /// <summary>
         /// 客户ID

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

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 舱位需求预报记录箱信息
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_demand_ctn", "舱位需求预报记录箱信息")]
-    public class BookingSlotDemandCtn : BaseModelV2<long>
+    public class BookingSlotDemandCtn : BaseModel<long>
     {
         /// <summary>
         /// 舱位需求预报记录ID

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

@@ -13,7 +13,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 舱位库存表
     /// </summary>
     [SqlSugar.SugarTable("op_sea_booking_slot_stock", "舱位库存表")]
-    public class BookingSlotStock : BaseModelV2<long>
+    public class BookingSlotStock : BaseModel<long>
     {
         /// <summary>
         /// 船名

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

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 预订舱记录表
     /// </summary>
     [SqlSugar.SugarTable("op_sea_space_booking_order", "预订舱记录表")]
-    public class SpaceBookingOrder : BaseModelV2<long>
+    public class SpaceBookingOrder : BaseModel<long>
     {
         /// <summary>
         /// 订舱id

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

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 预订舱记录表箱信息
     /// </summary>
     [SqlSugar.SugarTable("op_sea_space_booking_order_ctn", "预订舱记录表箱信息")]
-    public class SpaceBookingOrderCtn : BaseModelV2<long>
+    public class SpaceBookingOrderCtn : BaseModel<long>
     {
         /// <summary>
         /// 主记录ID

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

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Op.Entity
     /// 预订舱记录表船期表信息
     /// </summary>
     [SqlSugar.SugarTable("op_sea_space_booking_order_shipschedule", "预订舱记录表船期表信息")]
-    public class SpaceBookingOrderShipSchedule : BaseModelV2<long>
+    public class SpaceBookingOrderShipSchedule : BaseModel<long>
     {
         /// <summary>
         /// 主记录ID

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

@@ -41,10 +41,11 @@ using DS.WMS.Core.Info.Dtos;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using AngleSharp.Dom.Events;
+using Microsoft.AspNetCore.Authorization;
 
 namespace DS.WMS.Core.Op.Method
 {
-    public class BookingSlotService //: IBookingSlotService
+    public class BookingSlotService : IBookingSlotService
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly ISqlSugarClient db;
@@ -1315,7 +1316,6 @@ namespace DS.WMS.Core.Op.Method
         /// <param name="fileTypeName">附件类型名称</param>
         /// <param name="moudle">附件模块代码</param>
         /// <returns></returns>
-        [NonAction]
         private async Task SaveEDIFile(long boookId, string FilePath, string fileName, long tenantId,
             string fileTypeCode = "bc", string fileTypeName = "Booking Confirmation", string moudle = "BookingSlot")
         {
@@ -2523,6 +2523,150 @@ namespace DS.WMS.Core.Op.Method
 
             return (true, "引入成功");
         }
+
+
+        /// <summary>
+        /// 检索舱位对应的订舱订单(BY 舱位主键)
+        /// </summary>
+        /// <param name="id">舱位ID</param>
+        /// <returns>返回回执</returns>
+        public async Task<BookingSlotWithOrderDto> SearchBookingSlotWithOrderById(long id)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 刷新库存
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task RefreshStock(BookingSlotStockUpdateModel input)
+        {
+            //input.TenantId = UserManager.TENANT_ID;
+            //更新库存
+            //await _publisher.PublishAsync(new ChannelEventSource("BookingSlotStock:Update", input));
+        }
+
+        #region 订舱编号检索舱位信息
+        /// <summary>
+        /// 订舱编号检索舱位信息
+        /// </summary>
+        /// <param name="slotBookingNo">订舱编号</param>
+        /// <param name="CarrierId">船公司ID</param>
+        /// <returns></returns>
+        public async Task<long> QueryBookingSlot(string slotBookingNo, string CarrierId)
+        {
+            long id = 0;
+
+            try
+            {
+                var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+                var model = tenantDb.Queryable<BookingSlotBase>().First(x => x.SlotBookingNo == slotBookingNo && x.CarrierCode == CarrierId);
+
+                //if (model == null)
+                    //throw Oops.Bah("舱位信息不存在");
+
+                id = model.Id;
+            }
+            catch (Exception ex)
+            {
+                //_logger.LogInformation($"订舱编号检索舱位信息失败，原因：{ex.Message}");
+            }
+
+            return id;
+        }
+        #endregion
+
+        /// <summary>
+        /// 库存查询
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task<dynamic> PageStock(BookingSlotStockPageInput input)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 生成合票订舱订单
+        /// </summary>
+        /// <param name="model">生成订舱订单请求</param>
+        /// <returns>返回回执</returns>
+        public async Task<TaskManageOrderResultDto> MergeCreateBookingOrder(BookingGenerateDto model)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 估算差异重要提醒
+        /// </summary>
+        /// <param name="bcSrcDto">原舱位详情</param>
+        /// <param name="bcTargetDto">新舱位详情</param>
+        /// <param name="slotId">舱位ID</param>
+        /// <returns></returns>
+        [NonAction]
+        public async Task MeasureDiffCautionTask(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto, long slotId)
+        {
+            return;
+        }
+
+        /// <summary>
+        /// 检索舱位对应的订舱订单(BY 订舱编号)
+        /// </summary>
+        /// <param name="slotBookingNo">订舱编号</param>
+        /// <param name="tenantId">租户ID</param>
+        /// <returns>返回回执</returns>
+
+        public async Task<BookingSlotWithOrderDto> SearchBookingSlotWithOrderByNo(string slotBookingNo, long tenantId)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 导入舱位
+        /// </summary>
+        /// <param name="file">导入舱位文件</param>
+        /// <returns>返回回执</returns>
+        public async Task<TaskManageOrderResultDto> ImportSlotFromFile(IFormFile file)
+        {
+            return null;
+        }
+
+        Task<DataResult<List<BookingSlotBaseWithCtnDto>>> IBookingSlotService.GetAvailableSlots(BookingSlotBaseDto slotInput, List<long> slotIdListInput, PageWithTotal pageInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task<dynamic> IBookingSlotService.Page(BookingSlotBasePageInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task<long> IBookingSlotService.InnerApiReceive(BookingSlotBaseApiDto dto, DynameFileInfo file, DynameFileInfo modifyFile)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task<List<CompareResultDetailInfo>> IBookingSlotService.GetSlotCompareResult(long id, string batchNo)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task<TaskManageOrderResultDto> IBookingSlotService.CreateBookingOrder(BookingGenerateDto model)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task<string> IBookingSlotService.ExcuteCompare(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task<List<BookingSlotBaseSaveOutput>> IBookingSlotService.GetSlotList(long[] ids)
+        {
+            throw new NotImplementedException();
+        }
     }
 
     public static class LetterIndexUtil

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

@@ -1968,11 +1968,13 @@ namespace DS.WMS.Core.Op.Method
                 if (model == null)
                     throw new Exception(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.SpaceBookingAPIOrderDeletedOrNoExists)));
 
+                DateTime nowDate = DateTime.Now;
+
                 if (opTypeName == "BookingConfirmation")
                 {
                     model.IsRecvBC = true;
-                    model.LstRecvBCDate = DateTime.Now;
-                    model.UpdateTime = model.LstRecvBCDate;
+                    model.LstRecvBCDate = nowDate;
+                    model.UpdateTime = nowDate;
                     model.UpdateBy = long.Parse(user.UserId);
                     //model.UpdatedUserName = UserManager.Name;
 
@@ -1987,8 +1989,8 @@ namespace DS.WMS.Core.Op.Method
                 else if (opTypeName == "Cancellation")
                 {
                     model.IsRecvBKCancel = true;
-                    model.LstRecvBKCancelDate = DateTime.Now;
-                    model.UpdateTime = model.LstRecvBKCancelDate;
+                    model.LstRecvBKCancelDate = nowDate;
+                    model.UpdateTime = nowDate;
                     model.UpdateBy = long.Parse(user.UserId);
                     //model.UpdatedUserName = UserManager.Name;
 

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

@@ -2052,11 +2052,13 @@ namespace DS.WMS.Core.Op.Method
                 if (model == null)
                     throw new Exception(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.SpaceBookingAPIOrderDeletedOrNoExists)));
 
+                DateTime nowDate = DateTime.Now;
+
                 if (opTypeName == "BookingConfirmation")
                 {
                     model.IsRecvBC = true;
-                    model.LstRecvBCDate = DateTime.Now;
-                    model.UpdateTime = model.LstRecvBCDate;
+                    model.LstRecvBCDate = nowDate;
+                    model.UpdateTime = nowDate;
                     model.UpdateBy = long.Parse(user.UserId);
                     //model.UpdatedUserName = UserManager.Name;
 
@@ -2072,8 +2074,8 @@ namespace DS.WMS.Core.Op.Method
                 else if (opTypeName == "Cancellation")
                 {
                     model.IsRecvBKCancel = true;
-                    model.LstRecvBKCancelDate = DateTime.Now;
-                    model.UpdateTime = model.LstRecvBKCancelDate;
+                    model.LstRecvBKCancelDate = nowDate;
+                    model.UpdateTime = nowDate;
                     model.UpdateBy = long.Parse(user.UserId);
                     //model.UpdatedUserName = UserManager.Name;
 

ds-wms-service/DS.WMS.Core/Sys/Method/SysCacheService.cs

@@ -20,13 +20,11 @@ namespace DS.WMS.Core.Sys.Method
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly IRedisService _redisService;
-        private readonly ICodeVesselService _codeVesselService;
 
         public SysCacheService(IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
             _redisService = _serviceProvider.GetRequiredService<IRedisService>();
-            _codeVesselService = _serviceProvider.GetRequiredService<ICodeVesselService>();
         }
 
         /// <summary>

ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs

@@ -18,6 +18,10 @@ namespace DS.WMS.OpApi.Controllers
     {
         private readonly IBookingSlotService _bookingSlotService;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="bookingSlotService"></param>
         public BookingSlotServiceController(IBookingSlotService bookingSlotService)
         {
             _bookingSlotService = bookingSlotService;
@@ -35,7 +39,7 @@ namespace DS.WMS.OpApi.Controllers
         [Route("ApiReceive")]
         public async Task<DataResult<long>> ApiReceive(string jsonData, IFormFile file = null, IFormFile modifyFile = null)
         {
-            return await _bookingSlotService.ApiReceive(jsonData, file, modifyFile);
+            return await _bookingSlotService.ApiReceive(jsonData, null, null);
         }
         #endregion
 
@@ -47,7 +51,7 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回详情</returns>
         [HttpGet]
         [Route("Detail")]
-        public async Task<DataResult<BookingSlotBaseSaveOutput>> Detail(long id)
+        public async Task<DataResult<BookingSlotBaseSaveOutput>> Detail([FromQuery] long id)
         {
             return await _bookingSlotService.Detail(id);
         }
@@ -63,11 +67,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>可用的舱位列表（含可用的箱子列表）</returns>
         [HttpPost]
         [Route("GetAvailableSlots")]
-        public async Task<DataResult<List<BookingSlotBaseWithCtnDto>>> GetAvailableSlots(BookingSlotBaseDto slotInput = null,
-                                                                List<long> slotIdListInput = null,
-                                                                PageWithTotal pageInfo = null)
+        public async Task<DataResult<List<BookingSlotBaseWithCtnDto>>> GetAvailableSlots([FromBody] BookingSlotBaseDto slotInput )
         {
-            return await _bookingSlotService.GetAvailableSlots(slotInput, slotIdListInput, pageInfo);
+            return await _bookingSlotService.GetAvailableSlots(slotInput, null, null);
         }
         #endregion
 
@@ -80,9 +82,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>(指定订舱记录是否已经引入过舱位数据，现有舱位及箱子是否满足需求，提示信息)</returns>
         [HttpPost]
         [Route("CheckImportSlots")]
-        public async Task<(bool isExists, bool isEnough, string message)> CheckImportSlots(List<BookingSlotBaseWithCtnDto> slots, long bookingOrderId)
+        public async Task<DataResult> CheckImportSlots([FromBody] List<BookingSlotBaseWithCtnDto> slots)
         {
-            return await _bookingSlotService.CheckImportSlots(slots, bookingOrderId);
+            return null;//await _bookingSlotService.CheckImportSlots(slots, 0);
         }
         #endregion
 
@@ -97,9 +99,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>(是否成功，提示消息)</returns>
         [HttpPost]
         [Route("ImportSlots")]
-        public async Task<(bool isSuccess, string message)> ImportSlots(List<BookingSlotBaseWithCtnDto> slots, long bookingOrderId, bool isCheck, BookingGenerateDto generateModel = null)
+        public async Task<DataResult> ImportSlots([FromBody] List<BookingSlotBaseWithCtnDto> slots)
         {
-            return await _bookingSlotService.ImportSlots(slots, bookingOrderId, isCheck, generateModel);
+            return null;//await _bookingSlotService.ImportSlots(slots, 0, false, null);
         }
         #endregion
 
@@ -111,7 +113,7 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回列表</returns>
         [HttpPost]
         [Route("PageStock")]
-        public async Task<dynamic> PageStock([FromBody] BookingSlotStockPageInput input)
+        public async Task<DataResult> PageStock([FromBody] BookingSlotStockPageInput input)
         {
             return await _bookingSlotService.PageStock(input);
         }
@@ -125,9 +127,11 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回列表</returns>
         [HttpPost]
         [Route("RefreshStock")]
-        public async Task RefreshStock([FromBody] BookingSlotStockUpdateModel input)
+        public async Task<DataResult> RefreshStock([FromBody] BookingSlotStockUpdateModel input)
         {
             await _bookingSlotService.RefreshStock(input);
+
+            return null;
         }
         #endregion
 
@@ -138,8 +142,8 @@ namespace DS.WMS.OpApi.Controllers
         /// <param name="input">舱位详情</param>
         /// <returns>返回输出</returns>
         [HttpPost]
-        [Route("Save")]
-        public async Task<DataResult<BookingSlotBaseSaveOutput>> Save([FromBody] BookingSlotBaseSaveInput input)
+        [Route("Save3")]
+        public async Task<DataResult<BookingSlotBaseSaveOutput>> Save3([FromBody] BookingSlotBaseSaveInput input)
         {
             return await _bookingSlotService.Save(input);
         }
@@ -153,7 +157,7 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回附件列表</returns>
         [HttpGet]
         [Route("GetFile")]
-        public async Task<DataResult<List<OpFileRes>>> GetFile(long id)
+        public async Task<DataResult<List<OpFileRes>>> GetFile([FromQuery] long id)
         {
             return await _bookingSlotService.GetFile(id);
         }
@@ -167,7 +171,7 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("Page")]
-        public async Task<dynamic> Page([FromBody] BookingSlotBasePageInput input)
+        public async Task<DataResult> Page([FromBody] BookingSlotBasePageInput input)
         {
             return await _bookingSlotService.Page(input);
         }
@@ -183,9 +187,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("InnerApiReceive")]
-        public async Task<long> InnerApiReceive(BookingSlotBaseApiDto dto, DynameFileInfo file = null, DynameFileInfo modifyFile = null)
+        public async Task<DataResult<long>> InnerApiReceive([FromBody] BookingSlotBaseApiDto dto)
         {
-            return await _bookingSlotService.InnerApiReceive(dto, file, modifyFile);
+            return null;// await _bookingSlotService.InnerApiReceive(dto, null, null);
 
         }
         #endregion
@@ -199,9 +203,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回舱位变更比对结果</returns>
         [HttpGet]
         [Route("GetSlotCompareResult")]
-        public async Task<List<CompareResultDetailInfo>> GetSlotCompareResult(long id, string batchNo)
+        public async Task<DataResult<List<CompareResultDetailInfo>>> GetSlotCompareResult([FromQuery] long id, [FromQuery] string batchNo)
         {
-            return await _bookingSlotService.GetSlotCompareResult(id, batchNo);
+            return null;//await _bookingSlotService.GetSlotCompareResult(id, batchNo);
         }
         #endregion
 
@@ -213,9 +217,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回回执</returns>
         [HttpPost]
         [Route("ImportSlotFromFile")]
-        public async Task<TaskManageOrderResultDto> ImportSlotFromFile(IFormFile file)
+        public async Task<DataResult> ImportSlotFromFile([FromBody] IFormFile file)
         {
-            return await _bookingSlotService.ImportSlotFromFile(file);
+            return null;//await _bookingSlotService.ImportSlotFromFile(file);
         }
         #endregion
 
@@ -226,10 +230,10 @@ namespace DS.WMS.OpApi.Controllers
         /// <param name="model">生成订舱订单请求</param>
         /// <returns>返回回执</returns>
         [HttpPost]
-        [Route("ImportSlotFromFile")]
-        public async Task<TaskManageOrderResultDto> CreateBookingOrder([FromBody] BookingGenerateDto model)
+        [Route("CreateBookingOrder")]
+        public async Task<DataResult> CreateBookingOrder([FromBody] BookingGenerateDto model)
         {
-            return await _bookingSlotService.CreateBookingOrder(model);
+            return null;// await _bookingSlotService.CreateBookingOrder(model);
         }
         #endregion
 
@@ -241,9 +245,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回回执</returns>
         [HttpGet]
         [Route("SearchBookingSlotWithOrderById")]
-        public async Task<BookingSlotWithOrderDto> SearchBookingSlotWithOrderById(long id)
+        public async Task<DataResult<BookingSlotWithOrderDto>> SearchBookingSlotWithOrderById([FromQuery] long id)
         {
-            return await _bookingSlotService.SearchBookingSlotWithOrderById(id);
+            return null; //await _bookingSlotService.SearchBookingSlotWithOrderById(id);
         }
         #endregion
 
@@ -256,9 +260,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回回执</returns>
         [HttpGet]
         [Route("SearchBookingSlotWithOrderByNo")]
-        public async Task<BookingSlotWithOrderDto> SearchBookingSlotWithOrderByNo(string slotBookingNo, long tenantId)
+        public async Task<DataResult<BookingSlotWithOrderDto>> SearchBookingSlotWithOrderByNo([FromQuery] string slotBookingNo, [FromQuery] long tenantId)
         {
-            return await _bookingSlotService.SearchBookingSlotWithOrderByNo(slotBookingNo, tenantId);
+            return null; //await _bookingSlotService.SearchBookingSlotWithOrderByNo(slotBookingNo, tenantId);
         }
         #endregion
 
@@ -267,13 +271,12 @@ namespace DS.WMS.OpApi.Controllers
         /// 请求BC比对
         /// </summary>
         /// <param name="bcSrcDto">BC详情</param>
-        /// <param name="bcTargetDto">BC变更后详情</param>
         /// <returns>返回回执</returns>
         [HttpPost]
         [Route("ExcuteCompare")]
-        public async Task<string> ExcuteCompare(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto)
+        public async Task<DataResult<string>> ExcuteCompare([FromBody] ParserBCInfoDto bcSrcDto)
         {
-            return await _bookingSlotService.ExcuteCompare(bcSrcDto, bcTargetDto);
+            return null;// await _bookingSlotService.ExcuteCompare(bcSrcDto, null);
         }
         #endregion
 
@@ -282,15 +285,12 @@ namespace DS.WMS.OpApi.Controllers
         /// 推送BC变更比对
         /// </summary>
         /// <param name="bcSrcDto">原舱位详情</param>
-        /// <param name="bcTargetDto">变更后舱位详情</param>
-        /// <param name="slotId">舱位主键</param>
-        /// <param name="reqBatchNo">请求批次号用来区分对应的哪个批次任务</param>
         /// <returns></returns>
         [HttpPost]
         [Route("PushCompareBCInfo")]
-        public async Task PushCompareBCInfo(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto, long slotId, string reqBatchNo)
+        public async Task<DataResult<string>> PushCompareBCInfo([FromBody] ParserBCInfoDto bcSrcDto)
         {
-            await _bookingSlotService.PushCompareBCInfo(bcSrcDto, bcTargetDto, slotId, reqBatchNo);
+            return null;// _bookingSlotService.PushCompareBCInfo(bcSrcDto, null, 0, "");
         }
         #endregion
 
@@ -304,9 +304,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("MeasureDiffCautionTask")]
-        public async Task MeasureDiffCautionTask(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto, long slotId)
+        public async Task<DataResult> MeasureDiffCautionTask([FromBody] ParserBCInfoDto bcSrcDto)
         {
-            await _bookingSlotService.MeasureDiffCautionTask(bcSrcDto, bcTargetDto, slotId);
+            return null;// await _bookingSlotService.MeasureDiffCautionTask(bcSrcDto, null, 0);
         }
         #endregion
 
@@ -319,9 +319,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("QueryBookingSlot")]
-        public async Task<long> QueryBookingSlot(string slotBookingNo, string CarrierId)
+        public async Task<DataResult<long>> QueryBookingSlot([FromQuery] string slotBookingNo, [FromQuery] string CarrierId)
         {
-            return await _bookingSlotService.QueryBookingSlot(slotBookingNo, CarrierId);
+            return null;// await _bookingSlotService.QueryBookingSlot(slotBookingNo, CarrierId);
         }
         #endregion
 
@@ -333,9 +333,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回舱位详情</returns>
         [HttpPost]
         [Route("GetSlotList")]
-        public async Task<List<BookingSlotBaseSaveOutput>> GetSlotList(long[] ids)
+        public async Task<DataResult<List<BookingSlotBaseSaveOutput>>> GetSlotList([FromBody] long[] ids)
         {
-            return await _bookingSlotService.GetSlotList(ids);
+            return null;// await _bookingSlotService.GetSlotList(ids);
         }
         #endregion
 
@@ -347,9 +347,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("GetMergeList")]
-        public async Task<BookingSlotMergeResultDto> GetMergeList(QueryMergeSlotDto model)
+        public async Task<DataResult<BookingSlotMergeResultDto>> GetMergeList([FromBody] QueryMergeSlotDto model)
         {
-            return await _bookingSlotService.GetMergeList(model);
+            return null;// await _bookingSlotService.GetMergeList(model);
         }
         #endregion
 
@@ -361,9 +361,9 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回回执</returns>
         [HttpPost]
         [Route("MergeCreateBookingOrder")]
-        public async Task<TaskManageOrderResultDto> MergeCreateBookingOrder(BookingGenerateDto model)
+        public async Task<DataResult<TaskManageOrderResultDto>> MergeCreateBookingOrder([FromBody] BookingGenerateDto model)
         {
-            return await _bookingSlotService.MergeCreateBookingOrder(model);
+            return null;// await _bookingSlotService.MergeCreateBookingOrder(model);
         }
         #endregion
     }

ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt

@@ -425,3 +425,87 @@
 2024-07-17 16:10:54.4673 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
 2024-07-17 16:10:54.4752 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
 2024-07-17 16:10:54.4752 Info Configuration initialized.
+2024-07-18 17:00:49.1289 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:00:49.1289 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:00:49.1289 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:00:49.1529 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:00:49.1529 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:00:49.1610 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:00:49.1610 Info Configuration initialized.
+2024-07-18 17:01:32.1455 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:01:32.1455 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:01:32.1632 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:01:32.1632 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:01:32.1808 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:01:32.1808 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:01:32.1808 Info Configuration initialized.
+2024-07-18 17:02:46.2601 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:02:46.2723 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:02:46.2723 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:02:46.2854 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:02:46.2854 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:02:46.2854 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:02:46.2854 Info Configuration initialized.
+2024-07-18 17:03:18.4459 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:03:18.4613 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:03:18.4613 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:03:18.4738 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:03:18.4738 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:03:18.4738 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:03:18.4738 Info Configuration initialized.
+2024-07-18 17:05:17.8386 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:05:17.8501 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:05:17.8501 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:05:17.8638 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:05:17.8638 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:05:17.8638 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:05:17.8638 Info Configuration initialized.
+2024-07-18 17:06:53.9141 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:06:53.9312 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:06:53.9312 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:06:53.9482 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:06:53.9482 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:06:53.9606 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:06:53.9606 Info Configuration initialized.
+2024-07-18 17:08:59.2073 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:08:59.2277 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:08:59.2277 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:08:59.2425 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:08:59.2425 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:08:59.2585 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:08:59.2585 Info Configuration initialized.
+2024-07-18 17:11:43.2034 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:11:43.2174 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:11:43.2174 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:11:43.2306 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:11:43.2306 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:11:43.2396 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:11:43.2396 Info Configuration initialized.
+2024-07-18 17:12:51.9894 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:12:51.9894 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:12:52.0042 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:12:52.0042 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:12:52.0042 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:12:52.0216 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:12:52.0216 Info Configuration initialized.
+2024-07-18 17:15:47.6795 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-18 17:15:47.6795 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-18 17:15:47.6937 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-18 17:15:47.6937 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-18 17:15:47.7084 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-18 17:15:47.7084 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-18 17:15:47.7084 Info Configuration initialized.
+2024-07-19 08:36:16.5395 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-19 08:36:16.5558 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-19 08:36:16.5605 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-19 08:36:16.5605 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-19 08:36:16.5781 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-19 08:36:16.5781 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-19 08:36:16.5781 Info Configuration initialized.
+2024-07-19 08:45:15.9261 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-19 08:45:15.9380 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-19 08:45:15.9380 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-19 08:45:15.9380 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-19 08:45:15.9565 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-19 08:45:15.9565 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-19 08:45:15.9565 Info Configuration initialized.

ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi</_PublishTargetUrl>
-    <History>True|2024-07-18T08:18:45.8049777Z||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
+    <History>True|2024-07-18T11:24:50.4184188Z||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.Test/SaasTest.cs

@@ -212,18 +212,20 @@ public class SaasTest
     {
         var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
         StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 
-        //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder));
-        //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn));
-        //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn));
-        //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare));
+        tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder));
+        tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn));
+        tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn));
+        tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare));
         tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage));
+        tenantDb.CodeFirst.InitTables(typeof(BookingLabel));
+        tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation));
 
         //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty));
         //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail));