Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/EDI/MellEdiHelper.cs

@@ -772,6 +772,8 @@ namespace Myshipping.Application.EDI
                     r.WriteLine("TSR+11+2'");
                 }
 
+                icount = icount + 1;
+
                 var str_pay = "";
                 if (bill.BLFRT.IndexOf("PREPAID") >= 0)
                     str_pay = bill.PREPARDAT;
@@ -990,7 +992,7 @@ namespace Myshipping.Application.EDI
 
                 r.WriteLine("GID+1+" + bill.PKGS.ToString() + ":" + bill.KINDPKGS_EDI_CODE.Trim() + "::6:" + bill.KINDPKGS + "'");
 
-                icount = icount + 8;
+                icount = icount + 1;
 
                 if (!string.IsNullOrWhiteSpace(bill.HSCODE))
                 {
@@ -1045,12 +1047,19 @@ namespace Myshipping.Application.EDI
                     if (bill.CARGOID == "R")
                     {
                         if (bill.REEFERF != "" && bill.REEFERF != "0")
+                        {
                             r.WriteLine("MEA+AAE+AAS+CBM:" + bill.REEFERF + "'");
+                            icount = icount + 1;
+                        }
+                            
                         if (bill.HUMIDITY != "")
+                        {
                             r.WriteLine("MEA+AAE+AAO+HMD:" + bill.HUMIDITY + "'");
-
+                            icount = icount + 1;
+                        }
+                            
                         r.WriteLine("TMP+2+" + bill.TEMPSET.Replace("+", "") + ":CEL'");
-                        icount = icount + 2;
+                        icount = icount + 1;
 
 
                     }