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

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

@@ -457,6 +457,31 @@ namespace DS.WMS.Core.Op.Dtos
         /// 提单类型（MBL-Master单,HBL-House单）
         /// </summary>
         public string BLIssueType { get; set; }
+
+        /// <summary>
+        /// 委托编号
+        /// </summary>
+        public string CustomerNo { get; set; }
+
+        /// <summary>
+        /// 销售机构部门id
+        /// </summary>
+        public Nullable<long> SaleOrgId { get; set; }
+
+        /// <summary>
+        /// 销售机构部门
+        /// </summary>
+        public string SaleOrgName { get; set; }
+
+        /// <summary>
+        /// 销售部门id
+        /// </summary>
+        public Nullable<long> SaleDeptId { get; set; }
+
+        /// <summary>
+        /// 销售部门
+        /// </summary>
+        public string SaleDeptName { get; set; }
     }
 
     /// <summary>

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

@@ -447,5 +447,29 @@ namespace DS.WMS.Core.Op.Entity
         /// </summary>
         [SqlSugar.SugarColumn(ColumnDescription = "委托编号", Length = 20, IsNullable = true)]
         public string CustomerNo { get; set; }
+
+        /// <summary>
+        /// 销售机构部门id
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "销售机构部门id", IsNullable = true)]
+        public Nullable<long> SaleOrgId { get; set; }
+
+        /// <summary>
+        /// 销售机构部门
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "销售机构部门", Length = 20, IsNullable = true)]
+        public string SaleOrgName { get; set; }
+
+        /// <summary>
+        /// 销售部门id
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "销售部门id", Length = 20, IsNullable = true)]
+        public Nullable<long> SaleDeptId { get; set; }
+
+        /// <summary>
+        /// 销售部门
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "销售部门", Length = 20, IsNullable = true)]
+        public string SaleDeptName { get; set; }
     }
 }

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

@@ -7,6 +7,7 @@ using DS.Module.UserModule;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Flow.Dtos;
 using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.Op.Dtos.Cargoo;
 using DS.WMS.Core.Op.Entity;
 using DS.WMS.Core.Op.Interface;
 using DS.WMS.Core.Sys.Entity;
@@ -610,6 +611,14 @@ namespace DS.WMS.Core.Op.Method
             if (!res.Succeeded)
                return await Task.FromResult(DataResult.Failed(res.Message));
 
+            // 订舱完成推送Cargoo
+            var cargooService = _serviceProvider.GetRequiredService<ICargooService>();
+            await cargooService.SendCargoo(new CargooShipmentReqDto()
+            {
+                bookingId = task.BusinessId,
+                cargooStatusEnum = CargooStatusEnum.Confirmed
+            });
+
             return DataResult.Success;
              
         }

ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/EDIActionExecutor.cs

@@ -1,5 +1,6 @@
 using DS.Module.Core;
 using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.Op.Dtos.Cargoo;
 using DS.WMS.Core.Op.Interface;
 using DS.WMS.Core.TaskInteraction.Dtos;
 using Microsoft.Extensions.DependencyInjection;
@@ -49,6 +50,14 @@ namespace DS.WMS.Core.TaskInteraction.Method.ActionExecutor.Booking
             var task = context.TaskInfo;
             task.TaskType = TaskBaseTypeEnum.WAIT_BOOKING;
             await SetTaskCompleteAsync(task, TaskService, LogService);
+
+            // 订舱完成推送Cargoo
+            var cargooService = context.ServiceProvider.GetRequiredService<ICargooService>();
+            await cargooService.SendCargoo(new CargooShipmentReqDto()
+            {
+                bookingId = task.BusinessId,
+                cargooStatusEnum = CargooStatusEnum.Confirmed
+            });
         }
     }
 }

ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/MailActionExecutor.cs

@@ -1,4 +1,6 @@
 using DS.Module.Core;
+using DS.WMS.Core.Op.Dtos.Cargoo;
+using DS.WMS.Core.Op.Interface;
 using DS.WMS.Core.TaskInteraction.Dtos;
 using DS.WMS.Core.TaskInteraction.Entity;
 using DS.WMS.Core.TaskInteraction.Interface;
@@ -77,6 +79,14 @@ namespace DS.WMS.Core.TaskInteraction.Method.ActionExecutor.Booking
             var task = context.TaskInfo;
             task.TaskType = TaskBaseTypeEnum.WAIT_BOOKING;
             await SetTaskCompleteAsync(task, TaskService, LogService);
+
+            // 订舱完成推送Cargoo
+            var cargooService = context.ServiceProvider.GetRequiredService<ICargooService>();
+            await cargooService.SendCargoo(new CargooShipmentReqDto()
+            {
+                bookingId = task.BusinessId,
+                cargooStatusEnum = CargooStatusEnum.Confirmed
+            });
         }
 
     }

ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Utils
+{
+    public class ExportFileHelper
+    {
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="list"></param>
+        /// <param name="colDicts"></param>
+        /// <returns></returns>
+        public async Task<string> Export<T>(List<T> dataLiist, Dictionary<string,string> colDicts)
+        {
+            string filePath = string.Empty;
+
+            try
+            {
+
+            }
+            catch(Exception ex)
+            {
+
+            }
+
+            return filePath;
+        }
+    }
+}