20240201,inttr edi cma报文 增加默认的付款方

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs

@@ -4624,6 +4624,38 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                     }
                 }
 
+                //20240201 inttra edi 增加 付款方
+
+                if (billams.FREIGHTPAYER != "")
+                {
+                    if (billams.FREIGHTPAYER.Length > 35)
+                        r.WriteLine("NAD+FP+++" + billams.FREIGHTPAYER.Substring(0, 35) + "+" + billams.FREIGHTPAYER.Substring(35) + "'");
+                    else
+                        r.WriteLine("NAD+FP+++" + billams.FREIGHTPAYER + "'");
+
+                }
+                else
+                {
+                    //枚举类型81004中 enumvaluename='付款方'
+                    var enumList = BasicDataRefDAL.GetTSysEnumValueListByTypeid("81004");
+                    var 默认付款方 = "";
+                    try
+                    {
+                        默认付款方 = enumList.FirstOrDefault(x => x.EnumValueName == "付款方").EnumValueID;
+                    }
+                    catch (Exception e)
+                    {
+                        //20240201采用此值
+                        默认付款方 = "H&H INTERNATIONAL LOGISTICS COMPANY LIMITED";
+                    }
+
+                    if (默认付款方.Length > 35)
+                        r.WriteLine("NAD+FP+" + 默认付款方 + ":160:86++" + 默认付款方.Substring(0, 35) + "+" + 默认付款方.Substring(35) + "'");
+                    else
+                        r.WriteLine("NAD+FP+" + 默认付款方 + ":160:86++" + 默认付款方 + "'");
+                }
+                ////////////////////////
+
                 var alsendcode = ftpset.ALIASSENDCODE;
                 if (alsendcode == "")
                 {
@@ -5259,7 +5291,36 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                         r.WriteLine("NAD+FW+" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME + "'");
                 }
 
+                //20240201 inttra edi 增加 付款方
 
+                if (billams.FREIGHTPAYER != "")
+                {
+                    if (billams.FREIGHTPAYER.Length > 35)
+                        r.WriteLine("NAD+FP+++" + billams.FREIGHTPAYER.Substring(0, 35) + "+" + billams.FREIGHTPAYER.Substring(35) + "'");
+                    else
+                        r.WriteLine("NAD+FP+++" + billams.FREIGHTPAYER + "'");
+
+                }
+                else
+                {
+                    //枚举类型81004中 enumvaluename='付款方'
+                    var enumList = BasicDataRefDAL.GetTSysEnumValueListByTypeid("81004");
+                    var 默认付款方 = "";
+                    try
+                    {
+                        默认付款方 = enumList.FirstOrDefault(x => x.EnumValueName == "付款方").EnumValueID;
+                    }
+                    catch (Exception e) {
+                        //20240201采用此值
+                        默认付款方 = "H&H INTERNATIONAL LOGISTICS COMPANY LIMITED";
+                    }
+
+                    if (默认付款方.Length > 35)
+                        r.WriteLine("NAD+FP+" + 默认付款方 + ":160:86++" + 默认付款方.Substring(0, 35) + "+" + 默认付款方.Substring(35) + "'");
+                    else
+                        r.WriteLine("NAD+FP+" + 默认付款方 + ":160:86++" + 默认付款方 + "'");
+                }
+                ////////////////////////
 
                 icount++;