代码冲突修改

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

@@ -50,7 +50,7 @@ public partial class SeaExportService : ISeaExportService
     private readonly ISysCacheService _sysCacheService;
     private readonly IRabbitMQService _rabbitMQService;
     private readonly IRedisService _redisBaseService;
-    private readonly IBookingSlotService _bookingSlotService;
+    //private readonly IBookingSlotService _bookingSlotService;
 
     private readonly Lazy<ITaskManageBaseService> _taskManageBaseService;
 
@@ -88,7 +88,7 @@ public partial class SeaExportService : ISeaExportService
         _configService = _serviceProvider.GetRequiredService<IConfigService>();
         _rabbitMQService = _serviceProvider.GetRequiredService<IRabbitMQService>();
         _redisBaseService = _serviceProvider.GetRequiredService<IRedisService>();
-        _bookingSlotService = _serviceProvider.GetRequiredService<IBookingSlotService>();
+        //_bookingSlotService = _serviceProvider.GetRequiredService<IBookingSlotService>();
 
 
         _taskManageBaseService = _serviceProvider.GetRequiredService<Lazy<ITaskManageBaseService>>();
@@ -503,19 +503,19 @@ public partial class SeaExportService : ISeaExportService
                 //return DataResult.Successed("更新成功!", MultiLanguageConst.DataUpdateSuccess);
                 await tenantDb.Ado.CommitTranAsync();
 
-                //保存会同步舱位
+                ////保存会同步舱位
-                await _bookingSlotService.SyncBookingOrderToSlot(new BookingOrderToSlotDto { 
+                //await _bookingSlotService.SyncBookingOrderToSlot(new BookingOrderToSlotDto { 
-                    BookingId = info.Id,
+                //    BookingId = info.Id,
-                    CustomerId = info.CustomerId,
+                //    CustomerId = info.CustomerId,
-                    CustomerName = info.CustomerName,
+                //    CustomerName = info.CustomerName,
-                    CustomerNo = info.CustomerNo,
+                //    CustomerNo = info.CustomerNo,
-                    DocId = info.Doc,
+                //    DocId = info.Doc,
-                    DocName = info.DocName,
+                //    DocName = info.DocName,
-                    SaleId = info.SaleId,
+                //    SaleId = info.SaleId,
-                    SaleName = info.Sale,
+                //    SaleName = info.Sale,
-                    OpId = info.OperatorId,
+                //    OpId = info.OperatorId,
-                    OpName = info.OperatorName
+                //    OpName = info.OperatorName
-                });
+                //});
 
                 return await Task.FromResult(DataResult.Successed("更新成功!", MultiLanguageConst.DataUpdateSuccess));
             }