diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 07e593fc..5de994d8 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -3163,6 +3163,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL if (str == "UASC") return "UASC"; if (str == "COSU") return "COSCO"; if (str == "OOLU") return "OOCL"; + if (str == "PIL") return "Pacific International Lines"; else return ""; } public static string GetBillNum(string str) @@ -6817,7 +6818,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL var icount = 0; var bsno = ""; var OpBill = new MsOpSeaeBill(); - r.WriteLine("UNB+UNOC:2+" + ftpset.SENDCODE + "SO:ZZZ+" + ftpset.RECEIVECODE + ":ZZZ+" + DateTime.Now.ToString("yyMMdd:HHmm") + "+" + headData[0].CUSTNO + "'"); + + r.WriteLine("UNB+UNOC:2+" + ftpset.SENDCODE + ":ZZZ+" + ftpset.RECEIVECODE + ":ZZZ+" + DateTime.Now.ToString("yyMMdd:HHmm") + "+" + headData[0].CUSTNO + "'"); icount = icount + 1; foreach (var bill in headData) { @@ -6919,9 +6921,6 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL // } // } - r.WriteLine("FTX+AAC+++" + bill.GOODSNAME + "'"); - icount = icount + 1; - var ftxCount = 1; if (!string.IsNullOrWhiteSpace(bill.EDIREMARK)) { @@ -7554,6 +7553,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL } + + r.WriteLine("FTX+AAC+++" + bill.GOODSNAME + "'"); + icount = icount + 1; + + if (isbill != 1) { r.WriteLine("MEA+AAE+WT+KGM:" + Math.Round(Convert.ToDecimal(bill.KGS), 3) + "'");