From eb6b496fd6538c54589358548cd4896b1fa95fd2 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 2 Jul 2024 17:14:56 +0800 Subject: [PATCH] MSK SPOT --- .../BookingOrder/BookingMSKSPOTAPIService.cs | 4 + .../BookingOrder/Dto/MSKSPOT/MSKAPIMapper.cs | 79 +++++++++++++++++++ .../Dto/MSKSPOT/MSKSPOTBookingDto.cs | 10 +++ 3 files changed, 93 insertions(+) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKSPOTAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKSPOTAPIService.cs index f723623e..0392e6e6 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKSPOTAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKSPOTAPIService.cs @@ -1188,6 +1188,8 @@ namespace Myshipping.Application.Service.BookingOrder entity.UpdatedUserId = UserManager.UserId; entity.UpdatedUserName = UserManager.Name; entity.CTN_STAT = ctnStat; + entity.BOOKING_CHANNEL_TYPE = "SPOT_API"; + entity.BOOKING_CHANNEL_TYPE_NAME = "SPOT订舱"; await _bookingDeliveryRecordRep.AsUpdateable(entity).IgnoreColumns(x => new { @@ -1292,6 +1294,8 @@ namespace Myshipping.Application.Service.BookingOrder entity.STATUS = "TEMP"; entity.STATUS_NAME = "暂存"; entity.CTN_STAT = ctnStat; + entity.BOOKING_CHANNEL_TYPE = "SPOT_API"; + entity.BOOKING_CHANNEL_TYPE_NAME = "SPOT订舱"; await _bookingDeliveryRecordRep.InsertAsync(entity); diff --git a/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKAPIMapper.cs b/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKAPIMapper.cs index 8d49b140..cfc903ed 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKAPIMapper.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKAPIMapper.cs @@ -95,6 +95,85 @@ namespace Myshipping.Application .Map(dest => dest.SHIP_RATE_PID, src => src.PId) .Map(dest => dest.SHIP_RATE_MD5, src => src.MD5); + config.ForType() + .Map(dest => dest.id, src => src.Id) + .Map(dest => dest.carrierId, src => src.CARRIERID) + .Map(dest => dest.priceReference, src => src.PRICE_REFERENCE) + .Map(dest => dest.productCode, src => src.PRODUCT_CODE) + .Map(dest => dest.sender, src => src.SENDER) + .Map(dest => dest.bookedByCompanyName, src => src.BOOKEDBY_COMPANY_NAME) + .Map(dest => dest.bookedByMaerskPartyCode, src => src.BOOKEDBY_COMPANY_PARTYCODE) + .Map(dest => dest.bookedByCompanyContactName, src => src.BOOKEDBY_COMPANY_CONTACT) + .Map(dest => dest.bookedByCompanyContactEmail, src => src.BOOKEDBY_COMPANY_CONTACT_EMAIL) + .Map(dest => dest.isBookingPartOwnPrice, src => src.IS_BOOKING_PART_OWN_PRICE) + .Map(dest => dest.priceOwnerCompanyName, src => src.PRICE_OWNER_COMPANY_NAME) + .Map(dest => dest.priceOwnerMaerskPartyCode, src => src.PRICE_OWNER_COMPANY_PARTYCODE) + .Map(dest => dest.priceOwnerContactName, src => src.PRICE_OWNER_COMPANY_CONTACT) + .Map(dest => dest.priceOwnerContactEmail, src => src.PRICE_OWNER_COMPANY_CONTACT_EMAIL) + .Map(dest => dest.carrierCode, src => src.CARRIER_CODE) + .Map(dest => dest.earliestDepartureDate, src => src.EARLIEST_DEPARTURE_DATE) + .Map(dest => dest.exportServiceMode, src => src.EXPORT_SERVICE_MODE) + .Map(dest => dest.importServiceMode, src => src.IMPORT_SERVICE_MODE) + .Map(dest => dest.placeOfReceiptCityName, src => src.PLACERECEIPT_CITY) + .Map(dest => dest.placeOfReceiptUnLocCode, src => src.PLACERECEIPT_UNLOC_CODE) + .Map(dest => dest.placeOfDeliveryCityName, src => src.PLACEDELIVERY_CITY) + .Map(dest => dest.placeOfDeliveryUnLocCode, src => src.PLACEDELIVERY_UNLOC_CODE) + .Map(dest => dest.originDepartureDateTimeLocal, src => src.ETD) + .Map(dest => dest.destinationArrivalDateTimeLocal, src => src.ETA) + .Map(dest => dest.vesselName, src => src.VESSEL) + .Map(dest => dest.carrierVesselCode, src => src.VESSEL_CODE) + .Map(dest => dest.exportVoyageNumber, src => src.VOYNO) + .Map(dest => dest.transportMode, src => src.TRANSPORT_MODE) + .Map(dest => dest.totalCargoWeight, src => src.TOTAL_CARGO_WEIGHT) + .Map(dest => dest.noOfProbes, src => src.NO_OF_PROBES) + .Map(dest => dest.temperature, src => src.TEMPSET) + .Map(dest => dest.ventilation, src => src.VENT) + .Map(dest => dest.humidity, src => src.HUMIDITY) + .Map(dest => dest.commodityCodeType, src => src.COMMODITY_CODE_TYPE) + .Map(dest => dest.commodityCode, src => src.GOODSCODE) + .Map(dest => dest.commodityName, src => src.GOODSNAME) + .Map(dest => dest.isReefer, src => src.IS_REEFER) + .Map(dest => dest.cargoType, src => src.CARGO_TYPE) + .Map(dest => dest.placeOfReceiptCountryCode, src => src.PLACERECEIPT_COUNTRY_CODE) + .Map(dest => dest.placeOfDeliveryCountryCode, src => src.PLACEDELIVERY_COUNTRY_CODE) + .Map(dest => dest.EstSailingDays, src => src.EST_SAILING_DAYS) + .Map(dest => dest.priceReferenceId, src => src.PRICE_REFERENCE_ID) + .Map(dest => dest.priceReferenceName, src => src.PRICE_REFERENCE_NAME) + .Map(dest => dest.priceOwnerReferenceId, src => src.PRICE_OWNER_REFERENCE_ID) + .Map(dest => dest.priceOwnerReference, src => src.PRICE_OWNER_REFERENCE) + .Map(dest => dest.priceOwnerReferenceName, src => src.PRICE_OWNER_REFERENCE_NAME) + .Map(dest => dest.isShipperOwned, src => src.IS_SHIPPER_OWNED) + .Map(dest => dest.isImportReturned, src => src.IS_IMPORT_RETURNED) + .Map(dest => dest.carrierProductId, src => src.CARRIER_PRODUCT_ID) + .Map(dest => dest.isSendNoSchedule, src => src.IS_SEND_NO_SCHEDULE) + .Map(dest => dest.placeOfReceiptCountryName, src => src.PLACERECEIPT_COUNTRY_NAME) + .Map(dest => dest.placeOfReceiptRegionName, src => src.PLACERECEIPT_REGION_NAME) + .Map(dest => dest.placeOfDeliveryCountryName, src => src.PLACEDELIVERY_COUNTRY_NAME) + .Map(dest => dest.placeOfDeliveryRegionName, src => src.PLACEDELIVERY_REGION_NAME) + .Map(dest => dest.userPlaceOfDeliveryCityName, src => src.USER_PLACEDELIVERY_CITY) + .Map(dest => dest.userPlaceOfDeliveryCountryCode, src => src.USER_PLACEDELIVERY_COUNTRY_CODE) + .Map(dest => dest.userPlaceOfDeliveryCountryName, src => src.USER_PLACEDELIVERY_COUNTRY_NAME) + .Map(dest => dest.userPlaceOfDeliveryUnLocCode, src => src.USER_PLACEDELIVERY_UNLOC_CODE) + .Map(dest => dest.userPlaceOfDeliveryRegionName, src => src.USER_PLACEDELIVERY_REGION_NAME) + .Map(dest => dest.userPlaceOfReceiptCityName, src => src.USER_PLACERECEIPT_CITY) + .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.priceID, src => src.PRICE_ID) + .Map(dest => dest.ShipRateTotalAmount, src => src.SHIP_RATE_TOTAL_AMOUNT) + .Map(dest => dest.ShipRateTotalCurrency, src => src.SHIP_RATE_TOTAL_CURRENCY) + .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); + + + config.ForType() + .Map(dest => dest.CTN_CODE, src => src.ctnCode) + .Map(dest => dest.CTN_NAME, src => src.ctnName) + .Map(dest => dest.CTN_NUM, src => src.ctnNum) + .Map(dest => dest.CTN_SUFFER_WEIGHT, src => src.ctnSufferWeight); } } diff --git a/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKSPOTBookingDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKSPOTBookingDto.cs index 6e619bf7..afdeef7f 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKSPOTBookingDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/MSKSPOT/MSKSPOTBookingDto.cs @@ -386,5 +386,15 @@ namespace Myshipping.Application /// public string ShipRateTotalCurrency { get; set; } + /// + /// 订舱通道类型 CON_API-合约API，SPOT_API-SPOT订舱，EDI-EDI订舱 + /// + public string bookingChannelType { get; set; } + + /// + /// 订舱通道类型 CON_API-合约API，SPOT_API-SPOT订舱，EDI-EDI订舱 + /// + public string bookingChannelTypeName { get; set; } + } }