whm
/
JiCangHai
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
master
wanghaomei 2 years ago
parent 0c8217f81f 65fc8d47f7
commit 5802f2d069
2 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File

8
PingTai/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs
Unescape Escape View File

@ -4708,7 +4708,7 @@ namespace DSWeb.MvcShipping.Controllers
edi.INPUTBY = Session["SHOWNAME"].ToString(); edi.INPUTBY = Session["SHOWNAME"].ToString();
edi.INPUTBYID = Session["USERID"].ToString(); edi.INPUTBYID = Session["USERID"].ToString();
edi.CORPID = Session["COMPANYID"].ToString(); edi.CORPID = Session["COMPANYID"].ToString();
edi.CONSIGNEE = edi.CONSIGNEE==null?"": edi.CONSIGNEE.Replace(" ", " "); edi.CONSIGNEE = edi.CONSIGNEE == null ? "" : edi.CONSIGNEE.Replace(" ", " ");
edi.CONSIGNEENAME = edi.CONSIGNEENAME == null ? "" : edi.CONSIGNEENAME.Replace(" ", " "); edi.CONSIGNEENAME = edi.CONSIGNEENAME == null ? "" : edi.CONSIGNEENAME.Replace(" ", " ");
edi.NOTIFYPARTYNAME = edi.NOTIFYPARTYNAME == null ? "" : edi.NOTIFYPARTYNAME.Replace(" ", " "); edi.NOTIFYPARTYNAME = edi.NOTIFYPARTYNAME == null ? "" : edi.NOTIFYPARTYNAME.Replace(" ", " ");
@ -5152,6 +5152,8 @@ namespace DSWeb.MvcShipping.Controllers
ctn.ctn_id = Guid.NewGuid().ToString(); ctn.ctn_id = Guid.NewGuid().ToString();
ctn.MFNO = edi.MFNO; ctn.MFNO = edi.MFNO;
ctn.CNTRNO = it; 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.SEALNO = cclist.Where(x => x.CNTRNO == it).Select(x => x.SEALNO).FirstOrDefault();
ctn.CTNCODE = i.ToString().PadLeft(2, '0'); ctn.CTNCODE = i.ToString().PadLeft(2, '0');
ctn.CTNALL = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTNALL).FirstOrDefault(); ctn.CTNALL = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTNALL).FirstOrDefault();
@ -5497,7 +5499,7 @@ namespace DSWeb.MvcShipping.Controllers
if (merge) if (merge)
{ {
//没有主单的主提单号 //没有主单的主提单号
var mmList = ediList.Where(x => x.HBLNO != "" && x.BSNO == ""&&x.HBLNO!=x.MBLNO).Select(x => x.MBLNO).Distinct().ToList(); var mmList = ediList.Where(x => x.HBLNO != "" && x.BSNO == "" && x.HBLNO != x.MBLNO).Select(x => x.MBLNO).Distinct().ToList();
foreach (var item in mmList) foreach (var item in mmList)
@ -5608,6 +5610,8 @@ namespace DSWeb.MvcShipping.Controllers
ctn.ctn_id = Guid.NewGuid().ToString(); ctn.ctn_id = Guid.NewGuid().ToString();
ctn.MFNO = edi.MFNO; ctn.MFNO = edi.MFNO;
ctn.CNTRNO = it; 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.SEALNO = cclist.Where(x => x.CNTRNO == it).Select(x => x.SEALNO).FirstOrDefault();
ctn.CTNCODE = i.ToString().PadLeft(2, '0'); ctn.CTNCODE = i.ToString().PadLeft(2, '0');
ctn.CTNALL = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTNALL).FirstOrDefault(); ctn.CTNALL = cclist.Where(x => x.CNTRNO == it).Select(x => x.CTNALL).FirstOrDefault();

8
PingTai/DSWeb/Helper/AnalyzeNew.cs
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save