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

修改派车增加VGM

Browse Source
master
jianghaiqing 2 months ago
parent bd98d8b687
commit e72f530739
6 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File

4
Myshipping.Application/EDI/VOLTAEdiNewHelper.cs
Unescape Escape View File

@ -836,6 +836,9 @@ namespace Myshipping.Application.EDI.VOLTA
}
else ISSUETYPE = "EXP";
*/
if (InttrEdi.filetype == "E" || string.IsNullOrWhiteSpace(bill.ISSUETYPE))
{
if (bill.ISSUETYPE == "ORIGINAL")
{
ISSUETYPE = "ORI";
@ -845,6 +848,7 @@ namespace Myshipping.Application.EDI.VOLTA
ISSUETYPE = "TER";
}
else ISSUETYPE = "EXP";
}
//if (new string[] { "ORI", "TER", "EXP" }.Contains(bill.ISSUETYPE))
//{

6
Myshipping.Application/Entity/BookingTruckCtn.cs
Unescape Escape View File

@ -136,6 +136,10 @@ namespace Myshipping.Application.Entity
/// </summary>
[Description("备注")]
public string REMARK { get; set; }
/// <summary>
/// VGM
/// </summary>
[Description("VGM")]
public decimal? VGM { get; set; }
}
}

5
Myshipping.Application/Entity/TaskManagePlat/TaskTruckCtn.cs
Unescape Escape View File

@ -140,5 +140,10 @@ namespace Myshipping.Application.Entity
/// </summary>
[Description("备注")]
public string REMARK { get; set; }
/// <summary>
/// VGM
/// </summary>
[Description("VGM")]
public decimal? VGM { get; set; }
}
}

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

@ -7022,21 +7022,30 @@ namespace Myshipping.Application
if (ediRouteEnum == EDIRouteEnum.NULL)
throw Oops.Bah($"当前船公司没有对应的请求路由配置");
//这里船公司VOL的单子不能走此通道发送
if (ediRouteEnum == EDIRouteEnum.VOL)
{
var isVOLTASIExport = App.Configuration["IsVOLTASIExport"];
if (!string.IsNullOrWhiteSpace(isVOLTASIExport))
{
if (isVOLTASIExport == "1")
throw Oops.Bah($"当前船公司VOL不能执行标准发送");
}
else
var allowMblStart = App.Configuration["VOLTASIExportStart"].Split(new char[] { ',' });
//if (!order.MBLNO.StartsWith("VOL") && !order.MBLNO.StartsWith("FCS") && !order.MBLNO.StartsWith("REL") && !order.MBLNO.StartsWith("SLS"))
if (allowMblStart.Any(a => order.MBLNO.StartsWith(a)))
{
throw Oops.Bah($"当前船公司VOL不能执行标准发送");
}
//VOL、FCS、REL,SLS
throw Oops.Bah($"当前船公司{order.CARRIERID} 提单号开头（{(string.Join("、", allowMblStart.ToArray()))}）不能执行标准发送");
}
////这里船公司VOL的单子不能走此通道发送
//if (ediRouteEnum == EDIRouteEnum.VOL)
//{
// var isVOLTASIExport = App.Configuration["IsVOLTASIExport"];
// if (!string.IsNullOrWhiteSpace(isVOLTASIExport))
// {
// if (isVOLTASIExport == "1")
// throw Oops.Bah($"当前船公司VOL不能执行标准发送");
// }
// else
// {
// throw Oops.Bah($"当前船公司VOL不能执行标准发送");
// }
//}
//集装箱型
@ -11806,12 +11815,12 @@ namespace Myshipping.Application
*/
string batchNo = IDGen.NextID().ToString();
var isVOLTASIExport = App.Configuration["IsVOLTASIExport"];
//var isVOLTASIExport = App.Configuration["IsVOLTASIExport"];
if(!string.IsNullOrWhiteSpace(isVOLTASIExport) && isVOLTASIExport == "0")
{
throw Oops.Bah("配置IsVOLTASIExport=0不弹出窗口");
}
//if(!string.IsNullOrWhiteSpace(isVOLTASIExport) && isVOLTASIExport == "0")
//{
// throw Oops.Bah("配置IsVOLTASIExport=0不弹出窗口");
//}
_logger.LogInformation("批次={no}获取请求VOLTA截单详情 {msg}", batchNo, JSON.Serialize(model));
@ -11833,8 +11842,11 @@ namespace Myshipping.Application
_logger.LogInformation("批次={no}提取订单信息完成", batchNo);
if (!order.CARRIERID.Equals("VOL", StringComparison.OrdinalIgnoreCase) && !order.CARRIERID.Equals("FCS", StringComparison.OrdinalIgnoreCase)
&& !order.CARRIERID.Equals("SLS", StringComparison.OrdinalIgnoreCase))
var allowCarrier = App.Configuration["VOLTASIExportCarrier"].Split(new char[] { ',' });
//if (!order.CARRIERID.Equals("VOL", StringComparison.OrdinalIgnoreCase) && !order.CARRIERID.Equals("FCS", StringComparison.OrdinalIgnoreCase)
// && !order.CARRIERID.Equals("SLS", StringComparison.OrdinalIgnoreCase))
if (allowCarrier.Contains(order.CARRIERID))
{
throw Oops.Bah("当前订单的船公司不是VOL(沃尔塔航运)不能发送VOLTA截单EDI");
}
@ -11842,9 +11854,13 @@ namespace Myshipping.Application
if (string.IsNullOrWhiteSpace(order.MBLNO))
throw Oops.Bah($"提单号不能为空");
if (!order.MBLNO.StartsWith("VOL") && !order.MBLNO.StartsWith("FCS") && !order.MBLNO.StartsWith("REL") && !order.MBLNO.StartsWith("SLS"))
var allowMblStart = App.Configuration["VOLTASIExportStart"].Split(new char[] { ',' });
//if (!order.MBLNO.StartsWith("VOL") && !order.MBLNO.StartsWith("FCS") && !order.MBLNO.StartsWith("REL") && !order.MBLNO.StartsWith("SLS"))
if (!allowMblStart.Any(a => order.MBLNO.StartsWith(a)))
{
throw Oops.Bah($"只支持提单号开头是（VOL、FCS、REL,SLS）发送截单");
//VOL、FCS、REL,SLS
throw Oops.Bah($"只支持提单号开头是（{(string.Join("、", allowMblStart.ToArray()))}）发送截单");
}
bool isSeaLead = false;

5
Myshipping.Application/Service/BookingTruck/Dtos/BookingTruckCtnDto.cs
Unescape Escape View File

@ -108,5 +108,10 @@ namespace Myshipping.Application
/// 司机电话
/// </summary>
public string CarDriverTel { get; set; }
/// <summary>
/// VGM
/// </summary>
public Nullable<decimal> VGM { get; set; }
}
}

4
Myshipping.Web.Core/applicationconfig.json
Unescape Escape View File

@ -143,5 +143,7 @@
"EmailNoticeUrl": "http://47.104.73.97:8801/mail/send",
"EmailNoticeDefaultUser": "jianghaiqing@myshipping.net",
"BookingAmendModifyWebApiUrl": "http://localhost:5110/api/TaskBookingAmendmentParser/ModifyBookingAmendmentFile",
"IsVOLTASIExport": "0"
"IsVOLTASIExport": "0",
"VOLTASIExportCarrier": "SLS,REL",
"VOLTASIExportStart": "SLS,REL"
}
Write Preview
Loading…
Cancel
Save