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

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

@@ -867,7 +867,8 @@ namespace DS.WMS.Core.Op.Method
                 DataObj = new BookingSlotBaseApiSaveDto
                 {
                     CarrierId = carrierInfo?.LinkId,
-                    CarrierCode = carrierInfo?.Code,
+                    CarrierCode = carrierInfo?.MapCode,
+                    Carrier = carrierInfo?.MapName,
                     SlotBookingNo = taskBCInfoDto.MBLNo,
                     BookingParty = taskBCInfoDto.BookingParty,
                     BookingSlotType = taskBCInfoDto.BookingSlotType,
@@ -893,7 +894,7 @@ namespace DS.WMS.Core.Op.Method
                     PortDischarge = taskBCInfoDto.PortDischarge,
                     PortLoad = taskBCInfoDto.Portload,
                     SICutDate = taskBCInfoDto.SICutDate,
-                    //CustomSICutDate = taskBCInfoDto.CustomSICutDate,
+                    CustomSICutDate = taskBCInfoDto.CustomSICutDate,
                     TransferPort1 = taskBCInfoDto.TransferPort1,
                     TransferPort2 = taskBCInfoDto.TransferPort2,
                     PriceCalculationDate = taskBCInfoDto.PriceCalculationDate,

ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderBCInfo.cs

@@ -396,6 +396,11 @@ namespace DS.WMS.Core.TaskPlat.Dtos
         /// 货物标志
         /// </summary>
         public string CARGOID { get; set; }
+
+        /// <summary>
+        /// 客户样单截止日期
+        /// </summary>
+        public Nullable<DateTime> CustomSICutDate { get; set; }
     }