舱位管理

Myshipping.Application/Service/BookingSlot/BookingSlotService.cs

@@ -2711,28 +2711,39 @@ namespace Myshipping.Application
                     CUSTNO = custNo,
                     //MBLNO = bookingSlotBase.SLOT_BOOKING_NO.Trim(),
                     CONTRACTNO = !string.IsNullOrWhiteSpace(bookingSlotBase.CONTRACT_NO) ? bookingSlotBase.CONTRACT_NO : "",
-                    VESSEL = bookingSlotBase.VESSEL.ToUpper().Trim(),
-                    VOYNO = bookingSlotBase.VOYNO.ToUpper().Trim(),
-                    VOYNOINNER = bookingSlotBase.VOYNO.ToUpper().Trim(),
+                    VESSEL = bookingSlotBase.VESSEL?.ToUpper()?.Trim(),
+                    VOYNO = bookingSlotBase.VOYNO?.ToUpper()?.Trim(),
+                    VOYNOINNER = bookingSlotBase.VOYNO?.ToUpper()?.Trim(),
                     ETD = bookingSlotBase.ETD,
                     ETA = bookingSlotBase.ETA,
-                    SALEID = generateModel.SaleId.ToString(),
+                    SALEID = generateModel.SaleId?.ToString(),
                     SALE = generateModel.SaleName,
-                    OPID = generateModel.OpId.ToString(),
+                    OPID = generateModel.OpId?.ToString(),
                     OP = generateModel.OpName,
-                    DOCID = generateModel.DocId.ToString(),
+                    DOCID = generateModel.DocId?.ToString(),
                     DOC = generateModel.DocName,
-                    ROUTEID = generateModel.RouteID.ToString(),
+                    ROUTEID = generateModel.RouteID?.ToString(),
                     ROUTE = generateModel.Route,
                     CZRemark = generateModel.CZRemark,
                     ShenQingXiangShi = generateModel.ShenQingXiangShi,
-                    LineManageID = generateModel.LineManageID.ToString(),
+                    LineManageID = generateModel.LineManageID?.ToString(),
                     LineName = generateModel.LineManage,
                     CLOSEVGMDATE = bookingSlotBase.VGM_SUBMISSION_CUT_DATE,
                     CLOSINGDATE = bookingSlotBase.CY_CUT_DATE,
                     CLOSEDOCDATE = bookingSlotBase.SI_CUT_DATE,
-                    CUSTSERVICEID = generateModel.CustServiceId.HasValue ? generateModel.CustServiceId.Value.ToString() : null,
+                    CUSTSERVICEID = generateModel.CustServiceId?.ToString(),
                     CUSTSERVICE = generateModel.CustServiceName,
+
+                    PORTLOAD = bookingSlotBase.PORTLOAD,
+                    PORTLOADID = bookingSlotBase.PORTLOADID,
+                    PORTDISCHARGE = bookingSlotBase.PORTDISCHARGE,
+                    PORTDISCHARGEID = bookingSlotBase.PORTDISCHARGEID,
+
+                    PLACEDELIVERY = bookingSlotBase.PLACEDELIVERY,
+                    PLACEDELIVERYID = bookingSlotBase.PLACEDELIVERYID,
+                    PLACERECEIPT = bookingSlotBase.PLACERECEIPT,
+                    PLACERECEIPTID = bookingSlotBase.PLACERECEIPTID,
+
                     ctnInputs = new List<BookingCtnDto>()
                 };