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

EDI参数设置问题

Browse Source
booking_auth_dev
wanghaomei 2 years ago
parent c55ac67c3e
commit 8b0e221506
3 changed files with 72 additions and 48 deletions
Show Stats Download Patch File Download Diff File

88
Myshipping.Application/Myshipping.Application.xml
Unescape Escape View File

@ -5832,14 +5832,14 @@
业务状态 业务状态
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.BSSTATUSNAME"> <member name="P:Myshipping.Application.BookingOrderInput.BBSDATE">
<summary> <summary>
业务状态名称 业务开始日期
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.BSDATE"> <member name="P:Myshipping.Application.BookingOrderInput.EBSDATE">
<summary> <summary>
业务日期 业务截止日期
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.MBLNO"> <member name="P:Myshipping.Application.BookingOrderInput.MBLNO">
@ -5867,21 +5867,6 @@
客户合同号 客户合同号
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.SHIPPERID">
<summary>
发货人代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.CONSIGNEEID">
<summary>
收货人代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.NOTIFYPARTYID">
<summary>
通知人代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.SHIPPER"> <member name="P:Myshipping.Application.BookingOrderInput.SHIPPER">
<summary> <summary>
发货人 发货人
@ -5907,11 +5892,6 @@
场站代码 场站代码
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.YARD">
<summary>
场站
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.VESSELID"> <member name="P:Myshipping.Application.BookingOrderInput.VESSELID">
<summary> <summary>
船舶呼号 船舶呼号
@ -5932,39 +5912,64 @@
内部航次 内部航次
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.ETD"> <member name="P:Myshipping.Application.BookingOrderInput.BETD">
<summary> <summary>
开船日期 开船日期开始
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.ATD"> <member name="P:Myshipping.Application.BookingOrderInput.EETD">
<summary> <summary>
实际开船日期 开船日期截止
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.CLOSINGDATE"> <member name="P:Myshipping.Application.BookingOrderInput.BATD">
<summary> <summary>
截港日期 实际开船日期开始
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.CLOSEDOCDATE"> <member name="P:Myshipping.Application.BookingOrderInput.EATD">
<summary> <summary>
截单日期 实际开船日期截止
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.CLOSEVGMDATE"> <member name="P:Myshipping.Application.BookingOrderInput.BCLOSINGDATE">
<summary> <summary>
截VGM时间 截港日期开始
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.ETA"> <member name="P:Myshipping.Application.BookingOrderInput.ECLOSINGDATE">
<summary> <summary>
预计到港日期 截港日期截止
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.PLACERECEIPTID"> <member name="P:Myshipping.Application.BookingOrderInput.BCLOSEDOCDATE">
<summary> <summary>
收货地代码 截单日期开始
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.ECLOSEDOCDATE">
<summary>
截单日期截止
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.BCLOSEVGMDATE">
<summary>
截VGM时间开始
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.ECLOSEVGMDATE">
<summary>
截VGM时间截止
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.BETA">
<summary>
预计到港日期开始
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.EETA">
<summary>
预计到港日期截止
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.PLACERECEIPT"> <member name="P:Myshipping.Application.BookingOrderInput.PLACERECEIPT">
@ -6027,7 +6032,12 @@
签单方式 签单方式
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.BookingOrderInput.ISSUEDATE"> <member name="P:Myshipping.Application.BookingOrderInput.BISSUEDATE">
<summary>
签单日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderInput.EISSUEDATE">
<summary> <summary>
签单日期 签单日期
</summary> </summary>

28
Myshipping.Core/Service/DjyEdiSetting/DjyEdiSettingService.cs
Unescape Escape View File

@ -54,17 +54,20 @@ namespace Myshipping.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/DjyEdiSetting/add")] [HttpPost("/DjyEdiSetting/add")]
public async Task Add(AddDjyEdiSettingInput input) public async Task<long> Add(AddDjyEdiSettingInput input)
{ {
var cc = _rep.Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId); var cc = _rep.AsQueryable()
.Filter(null, true)
.Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID);
if (cc > 0) if (cc > 0)
{ {
throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）的参数设置"); throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）相同船司（{input.CARRIERID}）的参数设置");
} }
var entity = input.Adapt<DjyEdiSetting>(); var entity = input.Adapt<DjyEdiSetting>();
await _rep.InsertAsync(entity); await _rep.InsertAsync(entity);
await CacheData(); await CacheData();
return entity.Id;
} }
/// <summary> /// <summary>
@ -73,18 +76,28 @@ namespace Myshipping.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/DjyEdiSetting/edit")] [HttpPost("/DjyEdiSetting/edit")]
public async Task Update(UpdateDjyEdiSettingInput input) public async Task<long> Update(UpdateDjyEdiSettingInput input)
{ {
var entity = _rep.FirstOrDefault(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId); var entity = _rep.AsQueryable()
.Filter(null, true)
.First(x => x.Id == input.Id);
if (entity == null) if (entity == null)
{ {
throw Oops.Bah($"未找到数据"); throw Oops.Bah($"未找到数据");
} }
var cc = _rep.AsQueryable().Filter(null, true)
.Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID && x.Id != input.Id);
if (cc > 0)
{
throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）相同船司（{input.CARRIERID}）的参数设置");
}
entity = input.Adapt(entity); entity = input.Adapt(entity);
await _rep.UpdateAsync(entity); await _rep.UpdateAsync(entity);
await CacheData(); await CacheData();
return entity.Id;
} }
/// <summary> /// <summary>
@ -95,7 +108,8 @@ namespace Myshipping.Core.Service
[HttpPost("/DjyEdiSetting/delete")] [HttpPost("/DjyEdiSetting/delete")]
public async Task Delete(GetDjyEdiSettingInput input) public async Task Delete(GetDjyEdiSettingInput input)
{ {
var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); var entity = await _rep.AsQueryable().Filter(null, true)
.FirstAsync(u => u.Id == input.Id);
if (entity == null) if (entity == null)
{ {
throw Oops.Bah($"未找到数据"); throw Oops.Bah($"未找到数据");
@ -112,7 +126,7 @@ namespace Myshipping.Core.Service
[HttpGet("/DjyEdiSetting/detail")] [HttpGet("/DjyEdiSetting/detail")]
public async Task<DjyEdiSetting> Get([FromQuery] GetDjyEdiSettingInput input) public async Task<DjyEdiSetting> Get([FromQuery] GetDjyEdiSettingInput input)
{ {
return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); return await _rep.AsQueryable().Filter(null, true).FirstAsync(u => u.Id == input.Id);
} }
/// <summary> /// <summary>

4
Myshipping.Core/Service/DjyEdiSetting/IDjyEdiSettingService.cs
Unescape Escape View File

@ -8,8 +8,8 @@ namespace Myshipping.Core.Service
public interface IDjyEdiSettingService public interface IDjyEdiSettingService
{ {
Task<dynamic> Page([FromQuery] QueryDjyEdiSettingInput input); Task<dynamic> Page([FromQuery] QueryDjyEdiSettingInput input);
Task Add(AddDjyEdiSettingInput input); Task<long> Add(AddDjyEdiSettingInput input);
Task Update(UpdateDjyEdiSettingInput input); Task<long> Update(UpdateDjyEdiSettingInput input);
Task Delete(GetDjyEdiSettingInput input); Task Delete(GetDjyEdiSettingInput input);
Task<DjyEdiSetting> Get([FromQuery] GetDjyEdiSettingInput input); Task<DjyEdiSetting> Get([FromQuery] GetDjyEdiSettingInput input);
//Task<dynamic> List([FromQuery] QueryDjyEdiSettingInput input); //Task<dynamic> List([FromQuery] QueryDjyEdiSettingInput input);

Write Preview
Loading…
Cancel
Save