whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
optimize
wet 2 years ago
parent d33e94eb0d bb932a8df4
commit ec2bbc60a4
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File

23
Myshipping.Application/EDI/ESLEdiHelper.cs
Unescape Escape View File

@ -363,6 +363,9 @@ namespace Myshipping.Application.EDI.ESL
{ error = error + "<br />提单号：" + headData.MBLNO + " 目的地代码不能为空或录入不正确(必须是5位代码)"; }
}
if (string.IsNullOrEmpty(headData.ESLLINECODE))
{ error = error + "<br />提单号：" + headData.MBLNO + " 航司航线不能为空"; }
if (string.IsNullOrEmpty(headData.KINDPKGS_EDI_CODE))
{ error = error + "<br />提单号：" + headData.MBLNO + " 包装EDI代码不能为空"; }
if (headData.PKGS == 0)
@ -782,7 +785,7 @@ namespace Myshipping.Application.EDI.ESL
icount++;
r.WriteLine("11:" + bill.ESLLINECODE + ":" + bill.VESSEL + ":" + bill.VOYNO + ":::::" + GetDateStr(bill.ETD, "yyyyMMdd") + ":::::'");
r.WriteLine("11:" + bill.ESLLINECODE + ":" + bill.VESSEL + ":" + bill.VOYNO + ":::"+ InttrEdi.RECEIVECODE + "::" + GetDateStr(bill.ETD, "yyyyMMdd") + ":::::'");
icount++;
@ -828,7 +831,11 @@ namespace Myshipping.Application.EDI.ESL
Shipping = formatEdiStr("txt", bill.SHIPPER);
ShippingList = formatlengthStr(Shipping, 75);
/*
2023-04-06 ESL的EDI去掉校验后，这里需要截取需要按照最大35来截取
ShippingList = formatlengthStr(Shipping, 75);
*/
ShippingList = formatlengthStr(Shipping, 35);
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
@ -840,7 +847,11 @@ namespace Myshipping.Application.EDI.ESL
Shipping = formatEdiStr("txt", bill.CONSIGNEE);
ShippingList = formatlengthStr(Shipping, 75);
/*
2023-04-06 ESL的EDI去掉校验后，这里需要截取需要按照最大35来截取
ShippingList = formatlengthStr(Shipping, 75);
*/
ShippingList = formatlengthStr(Shipping, 35);
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
@ -851,7 +862,11 @@ namespace Myshipping.Application.EDI.ESL
Shipping = formatEdiStr("txt", bill.NOTIFYPARTY);
ShippingList = formatlengthStr(Shipping, 75);
/*
2023-04-06 ESL的EDI去掉校验后，这里需要截取需要按照最大35来截取
ShippingList = formatlengthStr(Shipping, 75);
*/
ShippingList = formatlengthStr(Shipping, 35);
if (ShippingList.Count != 0 && Shipping.Length > 0)
{

4
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -3618,6 +3618,9 @@ namespace Myshipping.Application
//航次取内部航次号 2023-04-03 合川操作确认这样调整
primaryModel.VOYNO = order.VOYNOINNER;
//航线信息直接取的航司航线（ESL用）
primaryModel.ESLLINECODE = order.LANENAME;
//起始港映射
var ediLoadPortList = _cache.GetAllMappingPortLoad().GetAwaiter().GetResult()
.Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase)
@ -3962,6 +3965,7 @@ namespace Myshipping.Application
primaryModel.KINGTAREWEIGHT = ediExtModel.KingTareweight.HasValue ? ediExtModel.KingTareweight.Value : 0;
//箱信息
var contaList = _repCtn.AsQueryable().Where(t => t.BILLID == order.Id).ToList();

Write Preview
Loading…
Cancel
Save