Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/BookingTruck/BookingTruckService.cs

@@ -497,7 +497,7 @@ namespace Myshipping.Application
 
             model.YARDID = orderInfo.YARDID;
             model.YARD = orderInfo.YARD;
-            model.ClosingTime = orderInfo.CLOSINGDATE;
+            
             model.InYardID = orderInfo.YARDID;
             model.InYard = orderInfo.YARD;
             model.MBLNo = orderInfo.MBLNO;
@@ -505,6 +505,13 @@ namespace Myshipping.Application
             model.VoyNo = orderInfo.VOYNO;
             model.YARDCONTRACT = orderInfo.YARDCONTRACT;
             model.YARDCONTRACTTEL = orderInfo.YARDCONTRACTTEL;
+
+            model.ClosingTime = orderInfo.CLOSINGDATE;
+
+            if(orderInfo.CLOSINGDATE.HasValue)
+            {
+                model.ReturnTime = orderInfo.CLOSINGDATE.Value;
+            }
             model.TruckTime = DateTime.Now;
 
             model.FromName = UserManager.Name;