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

PingTai/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs

@@ -5152,6 +5152,8 @@ namespace DSWeb.MvcShipping.Controllers
                                         ctn.ctn_id = Guid.NewGuid().ToString();
                                         ctn.MFNO = edi.MFNO;
                                         ctn.CNTRNO = it;
+                                        ctn.CTN = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTN).FirstOrDefault();
+                                        ctn.SIZE = cclist.Where(x => x.CNTRNO == it).Select(x => x.SIZE).FirstOrDefault();
                                         ctn.SEALNO = cclist.Where(x => x.CNTRNO == it).Select(x => x.SEALNO).FirstOrDefault();
                                         ctn.CTNCODE = i.ToString().PadLeft(2, '0');
                                         ctn.CTNALL = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTNALL).FirstOrDefault();
@@ -5608,6 +5610,8 @@ namespace DSWeb.MvcShipping.Controllers
                                         ctn.ctn_id = Guid.NewGuid().ToString();
                                         ctn.MFNO = edi.MFNO;
                                         ctn.CNTRNO = it;
+                                        ctn.CTN = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTN).FirstOrDefault();
+                                        ctn.SIZE = cclist.Where(x => x.CNTRNO == it).Select(x => x.SIZE).FirstOrDefault();
                                         ctn.SEALNO = cclist.Where(x => x.CNTRNO == it).Select(x => x.SEALNO).FirstOrDefault();
                                         ctn.CTNCODE = i.ToString().PadLeft(2, '0');
                                         ctn.CTNALL = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTNALL).FirstOrDefault();

PingTai/DSWeb/Helper/AnalyzeNew.cs

@@ -2481,7 +2481,7 @@ namespace DSWeb.Helper
                             flag = false;
                             return false;
                         }
-                        var codeCtn = codeCtnList.FirstOrDefault(cc => cc.EDICODE == item.CTNALL);
+                        var codeCtn = codeCtnList.FirstOrDefault(cc => cc.CTN == item.CTNALL);
                         if (codeCtn == null)
                         {
 
@@ -2491,7 +2491,7 @@ namespace DSWeb.Helper
                         else
                         {
 
-                            ctn.CTN = codeCtn.CTN;
+                            ctn.CTN = codeCtn.CTN.Replace(codeCtn.CTNSIZE, "");
                             ctn.SIZE = codeCtn.CTNSIZE;
                         }
 
@@ -2864,7 +2864,7 @@ namespace DSWeb.Helper
                             flag = false;
                             return false;
                         }
-                        var codeCtn = codeCtnList.FirstOrDefault(cc => cc.EDICODE == item.CTNALL);
+                        var codeCtn = codeCtnList.FirstOrDefault(cc => cc.CTN == item.CTNALL);
                         if (codeCtn == null)
                         {
 
@@ -2874,7 +2874,7 @@ namespace DSWeb.Helper
                         else
                         {
 
-                            ctn.CTN = codeCtn.CTN;
+                            ctn.CTN = codeCtn.CTN.Replace(codeCtn.CTNSIZE, "");
                             ctn.SIZE = codeCtn.CTNSIZE;
                         }