修改INTTRA

.gitignore

@@ -66,3 +66,4 @@ bin-release/
 LinkAttach
 /ds-wms-service/DS.WMS.AdminApi/Logs/internal-nlog.txt
 /ds-wms-service/DS.WMS.ContainerManagementApi/Logs/internal-nlog.txt
+/ds-wms-service/DS.WMS.OpApi/TempFiles/S24080044

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

@@ -359,14 +359,12 @@ namespace DS.WMS.Core.Op.EDI
                 }
 
 
-                if (InttrEdi.filetype == "E")
+                if (string.IsNullOrEmpty(headData.VESSEL))
-                {
+                { error = error + "<br />提单号：" + headData.MBLNO + " 船名不能为空"; }
-                    if (string.IsNullOrEmpty(headData.VESSEL))
+
-                    { error = error + "<br />提单号：" + headData.MBLNO + " 船名不能为空"; }
+                if (string.IsNullOrEmpty(headData.VOYNO))
+                { error = error + "<br />提单号：" + headData.MBLNO + " 航次不能为空"; }
 
-                    if (string.IsNullOrEmpty(headData.VOYNO))
-                    { error = error + "<br />提单号：" + headData.MBLNO + " 航次不能为空"; }
-                }
                 if (InttrEdi.filetype == "E")
                 {
                     if (headData.SIREMARK.IndexOf("PLEASE BOOK OCEAN CARRIER") > -1 || headData.SIREMARK.ToString().Trim() == "")
@@ -584,12 +582,22 @@ namespace DS.WMS.Core.Op.EDI
                 }
                 if (string.IsNullOrEmpty(headData.KINDPKGS_EDI_CODE))
                 { error = error + "<br />提单号：" + headData.MBLNO + " 包装EDI代码不能为空"; }
-                if (headData.PKGS == 0)
+
-                { error = error + "<br />提单号：" + headData.MBLNO + " 件数不能为0"; }
+                //CMA 订舱可以不填件数
+                if (!(InttrEdi.filetype.Equals("B", StringComparison.OrdinalIgnoreCase) && headData.CARRIEREDICODE.Equals("CMDU", StringComparison.OrdinalIgnoreCase)))
+                {
+                    if (headData.PKGS == 0)
+                    { error = error + "<br />提单号：" + headData.MBLNO + " 件数不能为0"; }
+                }
                 if (headData.KGS == 0)
                 { error = error + "<br />提单号：" + headData.MBLNO + " 毛重不能为0"; }
-                if (headData.CBM == 0)
+
-                { error = error + "<br />提单号：" + headData.MBLNO + " 尺码不能为0"; }
+                //CMA 订舱可以不填尺码
+                if (!(InttrEdi.filetype.Equals("B", StringComparison.OrdinalIgnoreCase) && headData.CARRIEREDICODE.Equals("CMDU", StringComparison.OrdinalIgnoreCase)))
+                {
+                    if (headData.CBM == 0)
+                    { error = error + "<br />提单号：" + headData.MBLNO + " 尺码不能为0"; }
+                }
 
                 if (headData.CARGOID == "D")
                 {

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

@@ -1145,7 +1145,7 @@ namespace DS.WMS.Core.Op.Method
 
             //TODO 数据映射
             var primaryModel = order.Adapt<SeaExportEDIBaseModel>();
-            primaryModel = orderEDI.Adapt<SeaExportEDIBaseModel>();
+            //primaryModel = orderEDI.Adapt<SeaExportEDIBaseModel>();
 
             //航次取内部航次号 2023-04-03 合川操作确认这样调整
             primaryModel.VOYNO = order.InnerVoyno;
@@ -1386,7 +1386,15 @@ namespace DS.WMS.Core.Op.Method
             }
             else
             {
-                primaryModel.ORDERNO = order.BookingNo;
+                if (ediRouteEnum == EDIRouteEnum.INTTRA)
+                {
+                    primaryModel.ORDERNO = order.CustomerNo;
+                }
+                else
+                {
+                    primaryModel.ORDERNO = order.BookingNo;
+                }
+                
             }
 
             //2023-06-15 按照沟通要求，如果主提单号为空，并且订舱编号不为空，可以去订舱编号填入主提单号

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

@@ -114,24 +114,24 @@ public partial class SeaExportService : ISeaExportService
                //.Map(dto => dto.BYCOUNTRY, poco => poco.)
                .Map(dto => dto.CARRIER, poco => poco.Carrier)
                .Map(dto => dto.CARRIERID, poco => poco.Carrier)
-               .Map(dto => dto.SHIPPER, poco => poco.Shipper)
+               .Map(dto => dto.SHIPPER, poco => poco.ShipperContent)
-               .Map(dto => dto.CONSIGNEE, poco => poco.Consignee)
+               .Map(dto => dto.CONSIGNEE, poco => poco.ConsigneeContent)
-               .Map(dto => dto.NOTIFYPARTY, poco => poco.NotifyParty)
+               .Map(dto => dto.NOTIFYPARTY, poco => poco.NotifyPartyContent)
-               .Map(dto => dto.NOTIFYPARTY2, poco => poco.SecondNotifyParty)
+               .Map(dto => dto.NOTIFYPARTY2, poco => poco.SecondNotifyPartyContent)
                .Map(dto => dto.HSCODE, poco => poco.HSCode)
                .Map(dto => dto.GOODSNAME, poco => poco.GoodsName)
                .Map(dto => dto.MARKS, poco => poco.Marks)
-               .Map(dto => dto.PLACERECEIPTID, poco => poco.ReceiptPlace)
+               //.Map(dto => dto.PLACERECEIPTID, poco => poco.ReceiptPlace)
                .Map(dto => dto.PLACERECEIPT, poco => poco.ReceiptPlace)
-               .Map(dto => dto.PORTLOADID, poco => poco.LoadPort)
+               //.Map(dto => dto.PORTLOADID, poco => poco.LoadPort)
                .Map(dto => dto.PORTLOAD, poco => poco.LoadPort)
-               .Map(dto => dto.PORTDISCHARGEID, poco => poco.DischargePort)
+               //.Map(dto => dto.PORTDISCHARGEID, poco => poco.DischargePort)
                .Map(dto => dto.PORTDISCHARGE, poco => poco.DischargePort)
                .Map(dto => dto.TRANSPORTID, poco => poco.TransPortCode)
                .Map(dto => dto.TRANSPORT, poco => poco.TransPort)
-               .Map(dto => dto.PLACEDELIVERYID, poco => poco.DeliveryPlace)
+               //.Map(dto => dto.PLACEDELIVERYID, poco => poco.DeliveryPlace)
                .Map(dto => dto.PLACEDELIVERY, poco => poco.DeliveryPlace)
-               .Map(dto => dto.DESTINATIONID, poco => poco.Destination)
+               //.Map(dto => dto.DESTINATIONID, poco => poco.Destination)
                .Map(dto => dto.DESTINATION, poco => poco.Destination)
                .Map(dto => dto.PKGS, poco => poco.PKGS)
                .Map(dto => dto.KINDPKGS, poco => poco.KindPkgs)
@@ -170,6 +170,8 @@ public partial class SeaExportService : ISeaExportService
                //.Map(dto => dto.FREIGHTPAYER, poco => poco.)
                //.Map(dto => dto.AMSCODE, poco => poco.)
                .Map(dto => dto.ISCONTAINERSOC, poco => poco.IsContainerSoc)
+               .Map(dto => dto.DESCRIPTION, poco => poco.Description)
+               .Map(dto => dto.CARGOID, poco => poco.CargoId)
                //.Map(dto => dto.GOODSCODE, poco => poco.GoodsName)
                //.Map(dto => dto.SERVICEEDICODE, poco => poco.)