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

修改INTTRA EDI报文，CMA 订舱时 收、发、通可以不填

Browse Source
master
jianghaiqing 6 months ago
parent 0301b3b15a
commit 99c5147ebd
2 changed files with 102 additions and 27 deletions
Show Stats Download Patch File Download Diff File

125
Myshipping.Application/EDI/InttraEdiHelper.cs
Unescape Escape View File

@ -425,51 +425,100 @@ namespace Myshipping.Application.EDI
{ error = error + "<br />提单号：" + headData.MBLNO + " 船公司EDI代码不能为空"; }
if (string.IsNullOrEmpty(headData.SHIPPER))
//CMA 订舱时，发货人可以不填
if (InttrEdi.filetype.Equals("B",StringComparison.OrdinalIgnoreCase) && headData.CARRIEREDICODE.Equals("CMDU", StringComparison.OrdinalIgnoreCase))
{
error = error + "<br />提单号：" + headData.MBLNO + " 发货人不能为空";
if (!string.IsNullOrWhiteSpace(headData.SHIPPER))
{
if (StringIsChinese(headData.SHIPPER))
{
error = error + "<br />提单号：" + headData.MBLNO + " 发货人含有中文或双字节字符";
}
else
{
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.SHIPPER, 35, headData.MBLNO, "发货人", 6, "-", false);
}
else
{
error += formatlengthError("txt", headData.SHIPPER, 35, headData.MBLNO, "发货人", 6, "*", false);
}
}
}
}
else
{
if (StringIsChinese(headData.SHIPPER))
if (string.IsNullOrEmpty(headData.SHIPPER))
{
error = error + "<br />提单号：" + headData.MBLNO + " 发货人含有中文或双字节字符";
error = error + "<br />提单号：" + headData.MBLNO + " 发货人不能为空";
}
else
{
if (headData.CARRIEREDICODE == "HLCU")
if (StringIsChinese(headData.SHIPPER))
{
error += formatlengthError("txt", headData.SHIPPER, 35, headData.MBLNO, "发货人", 6, "-", false);
error = error + "<br />提单号：" + headData.MBLNO + " 发货人含有中文或双字节字符";
}
else
{
error += formatlengthError("txt", headData.SHIPPER, 35, headData.MBLNO, "发货人", 6, "*", false);
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.SHIPPER, 35, headData.MBLNO, "发货人", 6, "-", false);
}
else
{
error += formatlengthError("txt", headData.SHIPPER, 35, headData.MBLNO, "发货人", 6, "*", false);
}
}
}
}
//}
//}
if (string.IsNullOrEmpty(headData.CONSIGNEE))
//CMA 订舱时，收货人可以不填
if (InttrEdi.filetype.Equals("B", StringComparison.OrdinalIgnoreCase) && headData.CARRIEREDICODE.Equals("CMDU", StringComparison.OrdinalIgnoreCase))
{
error = error + "<br />提单号：" + headData.MBLNO + " 收货人不能为空";
if (!string.IsNullOrWhiteSpace(headData.CONSIGNEE))
{
if (StringIsChinese(headData.CONSIGNEE))
{
error = error + "<br />提单号：" + headData.MBLNO + " 收货人含有中文或双字节字符";
}
else
{
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.CONSIGNEE, 35, headData.MBLNO, "收货人", 6, "--", false);
}
else
{
error += formatlengthError("txt", headData.CONSIGNEE, 35, headData.MBLNO, "收货人", 6, "**", false);
}
}
}
}
else
{
if (StringIsChinese(headData.CONSIGNEE))
if (string.IsNullOrEmpty(headData.CONSIGNEE))
{
error = error + "<br />提单号：" + headData.MBLNO + " 收货人含有中文或双字节字符";
error = error + "<br />提单号：" + headData.MBLNO + " 收货人不能为空";
}
else
{
if (headData.CARRIEREDICODE == "HLCU")
if (StringIsChinese(headData.CONSIGNEE))
{
error += formatlengthError("txt", headData.CONSIGNEE, 35, headData.MBLNO, "收货人", 6, "--", false);
error = error + "<br />提单号：" + headData.MBLNO + " 收货人含有中文或双字节字符";
}
else
{
error += formatlengthError("txt", headData.CONSIGNEE, 35, headData.MBLNO, "收货人", 6, "**", false);
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.CONSIGNEE, 35, headData.MBLNO, "收货人", 6, "--", false);
}
else
{
error += formatlengthError("txt", headData.CONSIGNEE, 35, headData.MBLNO, "收货人", 6, "**", false);
}
}
}
}
@ -504,30 +553,54 @@ namespace Myshipping.Application.EDI
}
}
if (string.IsNullOrEmpty(headData.NOTIFYPARTY))
//CMA 订舱时，通知人可以不填
if (InttrEdi.filetype.Equals("B", StringComparison.OrdinalIgnoreCase) && headData.CARRIEREDICODE.Equals("CMDU", StringComparison.OrdinalIgnoreCase))
{
//CMA 订舱时可以不填通知人
if (headData.CARRIEREDICODE != "CMDU")
if (!string.IsNullOrWhiteSpace(headData.NOTIFYPARTY))
{
error = error + "<br />提单号：" + headData.MBLNO + " 通知人不能为空";
if (StringIsChinese(headData.NOTIFYPARTY))
{
error = error + "<br />提单号：" + headData.MBLNO + " 通知人含有中文或双字节字符";
}
else
{
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 35, headData.MBLNO, "通知人", 6, "---", false);
}
else
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 35, headData.MBLNO, "通知人", 6, "***", false);
}
}
}
}
else
{
if (StringIsChinese(headData.NOTIFYPARTY))
if (string.IsNullOrEmpty(headData.NOTIFYPARTY))
{
error = error + "<br />提单号：" + headData.MBLNO + " 通知人含有中文或双字节字符";
//CMA 订舱时可以不填通知人
if (headData.CARRIEREDICODE != "CMDU")
{
error = error + "<br />提单号：" + headData.MBLNO + " 通知人不能为空";
}
}
else
{
if (headData.CARRIEREDICODE == "HLCU")
if (StringIsChinese(headData.NOTIFYPARTY))
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 35, headData.MBLNO, "通知人", 6, "---", false);
error = error + "<br />提单号：" + headData.MBLNO + " 通知人含有中文或双字节字符";
}
else
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 35, headData.MBLNO, "通知人", 6, "***", false);
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 35, headData.MBLNO, "通知人", 6, "---", false);
}
else
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 35, headData.MBLNO, "通知人", 6, "***", false);
}
}
}
}

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

@ -7544,7 +7544,9 @@ namespace Myshipping.Application
{
var flowno = BusinessIDGenHelper.GenNext(UserManager.TENANT_ID);
if(!string.IsNullOrWhiteSpace(flowno))
_logger.LogInformation("批次={no} INTTRA 判断业务编号长度不能大于14，重新生成 MBLNO={mblno} BOOKINGNO={BOOKINGNO} 新单号{flowno}", batchNo, primaryModel.MBLNO, order.BOOKINGNO, flowno);
if (!string.IsNullOrWhiteSpace(flowno))
{
order.BOOKINGNO = flowno;
await _rep.AsUpdateable(order).UpdateColumns(x => new { x.BOOKINGNO }).ExecuteCommandAsync();

Write Preview
Loading…
Cancel
Save