修改MSK API

Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs

@@ -1608,7 +1608,7 @@ namespace Myshipping.Application.Service.BookingOrder
                 entity.UpdatedUserName = UserManager.Name;
                 entity.CTN_STAT = ctnStat;
                 entity.BOOKING_CHANNEL_TYPE = "CON_API";
-                entity.BOOKING_CHANNEL_TYPE_NAME = "合约API";
+                entity.BOOKING_CHANNEL_TYPE_NAME = "合约订舱";
 
                 await _bookingDeliveryRecordRep.AsUpdateable(entity).IgnoreColumns(x => new
                 {
@@ -1735,7 +1735,7 @@ namespace Myshipping.Application.Service.BookingOrder
                 entity.STATUS_NAME = "暂存";
                 entity.CTN_STAT = ctnStat;
                 entity.BOOKING_CHANNEL_TYPE = "CON_API";
-                entity.BOOKING_CHANNEL_TYPE_NAME = "合约API";
+                entity.BOOKING_CHANNEL_TYPE_NAME = "合约订舱";
 
                 await _bookingDeliveryRecordRep.InsertAsync(entity);
 

Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs

@@ -155,8 +155,11 @@ namespace Myshipping.Application
                 .Map(dest => dest.USER_PLACERECEIPT_COUNTRY_CODE, src => src.userPlaceOfReceiptCountryCode)
                 .Map(dest => dest.USER_PLACERECEIPT_COUNTRY_NAME, src => src.userPlaceOfReceiptCountryName)
                 .Map(dest => dest.USER_PLACERECEIPT_UNLOC_CODE, src => src.userPlaceOfReceiptUnLocCode)
-                .Map(dest => dest.USER_PLACERECEIPT_REGION_NAME, src => src.userPlaceOfReceiptRegionName);
-
+                .Map(dest => dest.USER_PLACERECEIPT_REGION_NAME, src => src.userPlaceOfReceiptRegionName)
+                .Map(dest => dest.SHIP_RATE_PID, src => src.PId)
+                .Map(dest => dest.SHIP_RATE_MD5, src => src.MD5)
+                .Map(dest => dest.PLACERECEIPT_GEO_ID, src => src.carrierCollectionOriginGeoID)
+                .Map(dest => dest.PLACEDELIVERY_GEO_ID, src => src.carrierDeliveryDestinationGeoID);
 
 
 
@@ -224,8 +227,13 @@ namespace Myshipping.Application
                 .Map(dest => dest.userPlaceOfReceiptCountryCode, src => src.USER_PLACERECEIPT_COUNTRY_CODE)
                 .Map(dest => dest.userPlaceOfReceiptCountryName, src => src.USER_PLACERECEIPT_COUNTRY_NAME)
                 .Map(dest => dest.userPlaceOfReceiptUnLocCode, src => src.USER_PLACERECEIPT_UNLOC_CODE)
-                .Map(dest => dest.userPlaceOfReceiptRegionName, src => src.USER_PLACERECEIPT_REGION_NAME);
-
+                .Map(dest => dest.userPlaceOfReceiptRegionName, src => src.USER_PLACERECEIPT_REGION_NAME)
+                .Map(dest => dest.PId, src => src.SHIP_RATE_PID)
+                .Map(dest => dest.MD5, src => src.SHIP_RATE_MD5)
+                .Map(dest => dest.bookingChannelTypeName, src => src.BOOKING_CHANNEL_TYPE_NAME)
+                .Map(dest => dest.bookingChannelType, src => src.BOOKING_CHANNEL_TYPE)
+                .Map(dest => dest.carrierCollectionOriginGeoID, src => src.PLACERECEIPT_GEO_ID)
+                .Map(dest => dest.carrierDeliveryDestinationGeoID, src => src.PLACEDELIVERY_GEO_ID);
 
             config.ForType<MSKBookingCtnInfo, BookingDeliveryRecordCtn>()
                 .Map(dest => dest.CTN_CODE, src => src.ctnCode)

Myshipping.Application/Service/BookingOrder/Dto/MSKBookingDto.cs

@@ -381,6 +381,16 @@ namespace Myshipping.Application
         /// </summary>
         public string carrierDeliveryDestinationGeoID { get; set; }
 
+        /// <summary>
+        /// 订舱通道类型 CON_API-合约API，SPOT_API-SPOT订舱，EDI-EDI订舱
+        /// </summary>
+        public string bookingChannelType { get; set; }
+
+        /// <summary>
+        /// 订舱通道类型 CON_API-合约API，SPOT_API-SPOT订舱，EDI-EDI订舱
+        /// </summary>
+        public string bookingChannelTypeName { get; set; }
+
         /// <summary>
         /// 选择的船期详情
         /// </summary>