修改INTTRA

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

@@ -1224,17 +1224,6 @@ namespace DS.WMS.Core.Op.Method
             }
             #endregion
 
-            #region 目的地
-            //目的地
-            if (order.DischargePortId > 0)
-            {
-                var portRlt = GetPortEDICode(order.DestinationId, portList, mapPortList, order.CarrierId, CONST_MAPPING_MODULE, order.DischargePort, "目的地");
-
-                if (portRlt.Succeeded)
-                    primaryModel.DESTINATIONID = portRlt.Data;
-            }
-            #endregion
-
             #region 交货地
             //交货地
             if (order.DeliveryPlaceId > 0)
@@ -1246,6 +1235,35 @@ namespace DS.WMS.Core.Op.Method
             }
             #endregion
 
+            //INTTRA 订舱时改用交货地来填写到目的地
+            if (ediRouteEnum == EDIRouteEnum.INTTRA)
+            {
+                #region 目的地
+                //目的地
+                if (order.DeliveryPlaceId > 0)
+                {
+                    var portRlt = GetPortEDICode(order.DeliveryPlaceId, portList, mapPortList, order.CarrierId, CONST_MAPPING_MODULE, order.DischargePort, "目的地");
+
+                    if (portRlt.Succeeded)
+                        primaryModel.DESTINATIONID = portRlt.Data;
+                }
+                #endregion
+            }
+            else
+            {
+                #region 目的地
+                //目的地
+                if (order.DestinationId > 0)
+                {
+                    var portRlt = GetPortEDICode(order.DestinationId, portList, mapPortList, order.CarrierId, CONST_MAPPING_MODULE, order.DischargePort, "目的地");
+
+                    if (portRlt.Succeeded)
+                        primaryModel.DESTINATIONID = portRlt.Data;
+                }
+                #endregion
+            }
+            
+
             #region 到付地点
             //到付地点
             if (order.PayableAtId > 0)