From 44f64d1f7b10ddf4867096ed775c870b8ec5d7c7 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Fri, 11 Oct 2024 17:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9CARGOO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Op/Dtos/Cargoo/CargooShipmentResultDto.cs | 62 ++++++++++++++++
 .../Op/Dtos/Cargoo/CargooStatusEnum.cs        | 71 +++++++++++++++++++
 .../DS.WMS.Core/Op/EDI/CargooAPIHelper.cs     | 11 +--
 3 files changed, 140 insertions(+), 4 deletions(-)
 create mode 100644 ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooShipmentResultDto.cs
 create mode 100644 ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooStatusEnum.cs

diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooShipmentResultDto.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooShipmentResultDto.cs
new file mode 100644
index 00000000..f6535201
--- /dev/null
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooShipmentResultDto.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Op.Dtos.Cargoo
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class CargooShipmentResultDto
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string messageId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string timestamp { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<CargooShipmentResultDataDto> data { get; set; }
+    }
+
+    public class CargooShipmentResultDataDto
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string reference { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int code { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string description { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<DateTime> date { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string cargooReference { get; set; }
+    }
+}
diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooStatusEnum.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooStatusEnum.cs
new file mode 100644
index 00000000..a6a3ed9e
--- /dev/null
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/Cargoo/CargooStatusEnum.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Op.Dtos.Cargoo
+{
+    /// <summary>
+    /// Cargoo推送当前状态枚举
+    /// </summary>
+    public enum CargooStatusEnum
+    {
+        /// <summary>
+        /// ShipmentSubmitted
+        /// </summary>
+        [Description("ShipmentSubmitted")]
+        Submitted = 220,
+        /// <summary>
+        /// ShipmentConfirmed
+        /// </summary>
+        [Description("ShipmentConfirmed")]
+        Confirmed = 230,
+        /// <summary>
+        /// ShipmentGateOut
+        /// </summary>
+        [Description("ShipmentGateOut")]
+        GateOut = 310,
+        /// <summary>
+        /// ShipmentGateIn
+        /// </summary>
+        [Description("ShipmentGateIn")]
+        GateIn = 320,
+        /// <summary>
+        /// Shipment Cancelled
+        /// </summary>
+        [Description("Shipment Cancelled")]
+        Cancelled = 240,
+        /// <summary>
+        /// Shipment Rejected
+        /// </summary>
+        [Description("Shipment Rejected")]
+        Rejected = 245,
+        /// <summary>
+        /// ShipmentDeparted
+        /// </summary>
+        [Description("ShipmentDeparted")]
+        Shipped = 330,
+        /// <summary>
+        /// ShipmentArrived
+        /// </summary>
+        [Description("ShipmentArrived")]
+        Arrived = 370,
+        /// <summary>
+        /// ShipmentDischarged
+        /// </summary>
+        [Description("ShipmentDischarged")]
+        Discharged = 375,
+        /// <summary>
+        /// ShipmentContainersDepartedAtPod
+        /// </summary>
+        [Description("ShipmentContainersDepartedAtPod")]
+        Delivered = 390,
+        /// <summary>
+        /// ShipmentReturned
+        /// </summary>
+        [Description("ShipmentReturned")]
+        Completed = 396
+    }
+}
diff --git a/ds-wms-service/DS.WMS.Core/Op/EDI/CargooAPIHelper.cs b/ds-wms-service/DS.WMS.Core/Op/EDI/CargooAPIHelper.cs
index d80943e6..096dab11 100644
--- a/ds-wms-service/DS.WMS.Core/Op/EDI/CargooAPIHelper.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/EDI/CargooAPIHelper.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.Entity;
 using System;
 using System.Collections.Generic;
@@ -18,9 +19,10 @@ namespace DS.WMS.Core.Op.EDI
         /// <summary>
         /// 生成Cargoo报文(根据订舱详情生成报文)
         /// </summary>
-        /// <param name="bookingId"></param>
+        /// <param name="bookingId">订单ID</param>
+        /// <param name="cargooStatusEnum">状态枚举</param>
         /// <returns></returns>
-        public async Task<DataResult<CargooShipmentDto>> GetCargooShipmentDto(long bookingId)
+        public async Task<DataResult<CargooShipmentDto>> GetCargooShipmentDto(long bookingId, CargooStatusEnum cargooStatusEnum)
         {
             CargooShipmentDto dto = new CargooShipmentDto();
 
@@ -42,11 +44,12 @@ namespace DS.WMS.Core.Op.EDI
         /// </summary>
         /// <param name="bookingId"></param>
         /// <returns></returns>
-        public async Task<DataResult> SendCargooShipment(long bookingId)
+        public async Task<DataResult> SendCargooShipment(long bookingId, CargooStatusEnum cargooStatusEnum)
         {
             try
             {
-                var dto = await GetCargooShipmentDto(bookingId);
+                var dto = await GetCargooShipmentDto(bookingId, cargooStatusEnum);
+
             }
             catch (Exception ex)
             {