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

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs

@@ -284,7 +284,7 @@ public class SeaExportReq
     public DateTime? BLIssueSatus { get; set; }
 
     /// <summary>
-    /// 付款地点Id
+    /// 预付地点Id
     /// </summary>
     public long PrepareAtId { get; set; }
 
@@ -294,7 +294,7 @@ public class SeaExportReq
     public string PrepareAt { get; set; }
 
     /// <summary>
-    /// 预付地点
+    /// 付款地点
     /// </summary>
     public string PayableAt { get; set; }
 
@@ -1022,7 +1022,7 @@ public class SeaExportReq
     /// </summary>
     public long ThirdPayAtId { get; set; }
     /// <summary>
-    /// 预付地点Id
+    /// 付款地点Id
     /// </summary>
     public long PayableAtId { get; set; }
 

ds-wms-service/DS.WMS.Core/Op/EDI/YTEdiHelper.cs

@@ -642,10 +642,10 @@ namespace DS.WMS.Core.Op.EDI
                 //跟韩工确认增加判断
                 if (!string.IsNullOrWhiteSpace(headData.BLFRT) && headData.BLFRT.IndexOf("PREPAID") >= 0)
                 {
-                    if (string.IsNullOrWhiteSpace(headData.PREPARDAT))
+                    //if (string.IsNullOrWhiteSpace(headData.PREPARDAT))
-                    {
+                    //{
-                        error = error + "<br />提单号：" + headData.MBLNO + " 付费方式是预付，预付地点不能为空";
+                    //    error = error + "<br />提单号：" + headData.MBLNO + " 付费方式是预付，预付地点不能为空";
-                    }
+                    //}
 
                     if (!string.IsNullOrWhiteSpace(headData.PAYABLEAT))
                     {
@@ -654,10 +654,10 @@ namespace DS.WMS.Core.Op.EDI
                 }
                 else if (!string.IsNullOrWhiteSpace(headData.BLFRT) && headData.BLFRT.IndexOf("COLLECT") >= 0)
                 {
-                    if (string.IsNullOrWhiteSpace(headData.PAYABLEAT))
+                    //if (string.IsNullOrWhiteSpace(headData.PAYABLEAT))
-                    {
+                    //{
-                        error = error + "<br />提单号：" + headData.MBLNO + " 付费方式是到付，到付地点不能为空";
+                    //    error = error + "<br />提单号：" + headData.MBLNO + " 付费方式是到付，到付地点不能为空";
-                    }
+                    //}
 
                     if (!string.IsNullOrWhiteSpace(headData.PREPARDAT))
                     {

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

@@ -1277,6 +1277,7 @@ namespace DS.WMS.Core.Op.Method
                 }
                 #endregion
             }
+
             
 
             #region 到付地点
@@ -1290,6 +1291,16 @@ namespace DS.WMS.Core.Op.Method
             }
             #endregion
 
+            //如果处理的是到付，需要把预付地点来对应到付地点
+            if (!string.IsNullOrWhiteSpace(order.MBLFrt) && order.MBLFrt.IndexOf("COLLECT") >= 0)
+            {
+                primaryModel.PAYABLEATID = primaryModel.PREPARDATID;
+                primaryModel.PAYABLEAT = order.PrepareAt;
+
+                primaryModel.PREPARDATID = string.Empty;
+                primaryModel.PREPARDAT = string.Empty;
+            }
+
             //起运港是CNTAO并且船公司是太平需要判断场站EDI
             if (ediRouteEnum == EDIRouteEnum.WY)
             {