From 85ea0fee7d289d61343ec21d831b554c1c0cc93b Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Sat, 26 Oct 2024 11:03:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=8E=A8=E9=80=81cargoo=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Method/ActionExecutor/Booking/EDIActionExecutor.cs | 9 +++++++++ .../ActionExecutor/Booking/MailActionExecutor.cs | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/EDIActionExecutor.cs b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/EDIActionExecutor.cs index fdcd8a7d..9923b3d0 100644 --- a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/EDIActionExecutor.cs +++ b/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(); + await cargooService.SendCargoo(new CargooShipmentReqDto() + { + bookingId = task.BusinessId, + cargooStatusEnum = CargooStatusEnum.Confirmed + }); } } } diff --git a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/MailActionExecutor.cs b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/MailActionExecutor.cs index 6feeda95..2f0fd86c 100644 --- a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ActionExecutor/Booking/MailActionExecutor.cs +++ b/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(); + await cargooService.SendCargoo(new CargooShipmentReqDto() + { + bookingId = task.BusinessId, + cargooStatusEnum = CargooStatusEnum.Confirmed + }); } } From 2d19c9d40e4df1d18239a68a2eb428f169095448 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Sat, 26 Oct 2024 11:30:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=80=E8=88=B1=E5=85=A5=E6=B1=A0?= =?UTF-8?q?=E5=90=8E=E8=B0=83=E7=94=A8cargoo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/Method/SeaExportRefundService.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs index 8d263ef3..5e84009c 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs +++ b/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(); + await cargooService.SendCargoo(new CargooShipmentReqDto() + { + bookingId = task.BusinessId, + cargooStatusEnum = CargooStatusEnum.Confirmed + }); + return DataResult.Success; } From 30266bb730fd1193a1fe31ea08af6323b2ab8d5b Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 28 Oct 2024 09:04:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=88=B1=E4=BD=8D?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingSlot/BookingSlotBaseSaveOutput.cs | 25 +++++++++++++ .../Op/Entity/BookingSlot/BookingSlotBase.cs | 24 +++++++++++++ .../DS.WMS.Core/Utils/ExportFileHelper.cs | 35 +++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/BookingSlot/BookingSlotBaseSaveOutput.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/BookingSlot/BookingSlotBaseSaveOutput.cs index 1797adbb..27a695f0 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/BookingSlot/BookingSlotBaseSaveOutput.cs +++ b/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单） /// public string BLIssueType { get; set; } + + /// + /// 委托编号 + /// + public string CustomerNo { get; set; } + + /// + /// 销售机构部门id + /// + public Nullable SaleOrgId { get; set; } + + /// + /// 销售机构部门 + /// + public string SaleOrgName { get; set; } + + /// + /// 销售部门id + /// + public Nullable SaleDeptId { get; set; } + + /// + /// 销售部门 + /// + public string SaleDeptName { get; set; } } /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs index 1ce05ef1..54221222 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs @@ -447,5 +447,29 @@ namespace DS.WMS.Core.Op.Entity /// [SqlSugar.SugarColumn(ColumnDescription = "委托编号", Length = 20, IsNullable = true)] public string CustomerNo { get; set; } + + /// + /// 销售机构部门id + /// + [SqlSugar.SugarColumn(ColumnDescription = "销售机构部门id", IsNullable = true)] + public Nullable SaleOrgId { get; set; } + + /// + /// 销售机构部门 + /// + [SqlSugar.SugarColumn(ColumnDescription = "销售机构部门", Length = 20, IsNullable = true)] + public string SaleOrgName { get; set; } + + /// + /// 销售部门id + /// + [SqlSugar.SugarColumn(ColumnDescription = "销售部门id", Length = 20, IsNullable = true)] + public Nullable SaleDeptId { get; set; } + + /// + /// 销售部门 + /// + [SqlSugar.SugarColumn(ColumnDescription = "销售部门", Length = 20, IsNullable = true)] + public string SaleDeptName { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs b/ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs new file mode 100644 index 00000000..10f2003a --- /dev/null +++ b/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 + { + + /// + /// 导出 + /// + /// + /// + /// + /// + public async Task Export(List dataLiist, Dictionary colDicts) + { + string filePath = string.Empty; + + try + { + + } + catch(Exception ex) + { + + } + + return filePath; + } + } +}