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

订舱

Browse Source
booking_auth_dev
wet 2 years ago
parent 1ba883dc15
commit b329c27472
8 changed files with 91 additions and 968 deletions
Show Stats Download Patch File Download Diff File

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

@ -1708,35 +1708,28 @@
</member>
<member name="M:Myshipping.Application.BookingOrderService.Add(Myshipping.Application.AddBookingOrderInput)">
<summary>
增加订舱主表
增加订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.BookingOrderService.Delete(Myshipping.Application.DeleteBookingOrderInput)">
<member name="M:Myshipping.Application.BookingOrderService.Delete(System.Int64)">
<summary>
删除订舱主表
删除订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.BookingOrderService.Update(Myshipping.Application.UpdateBookingOrderInput)">
<summary>
更新订舱主表
更新订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.BookingOrderService.Get(Myshipping.Application.QueryeBookingOrderInput)">
<member name="M:Myshipping.Application.BookingOrderService.Get(System.Int64)">
<summary>
获取订舱主表
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.BookingOrderService.Updata">
<summary>
获取订舱明细
</summary>
<param name="input"></param>
<returns></returns>
@ -2363,7 +2356,7 @@
</member>
<member name="P:Myshipping.Application.BookingOrderDto.CUSTOMERID">
<summary>
客户代号
客户ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderDto.FORWARDERID">
@ -3206,750 +3199,10 @@
付款方
</summary>
</member>
<member name="P:Myshipping.Application.DeleteBookingOrderInput.Id">
<summary>
主键
</summary>
</member>
<member name="P:Myshipping.Application.UpdateBookingOrderInput.Id">
<summary>
主键
</summary>
</member>
<member name="T:Myshipping.Application.BookingOrderOutput">
<summary>
订舱主表输出参数
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.GID">
<summary>
主键
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.BSNO">
<summary>
业务编号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.BSSTATUS">
<summary>
业务状态
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.BSSTATUSNAME">
<summary>
业务状态名称
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.BSDATE">
<summary>
业务日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.MBLNO">
<summary>
主提单号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.HBLNO">
<summary>
分提单号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.BOOKINGNO">
<summary>
订舱编号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONTRACTNO">
<summary>
合约号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SERVICECONTRACTNO">
<summary>
客户合同号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERID">
<summary>
发货人代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEID">
<summary>
收货人代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYID">
<summary>
通知人代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPER">
<summary>
发货人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEE">
<summary>
收货人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTY">
<summary>
通知人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTY2">
<summary>
第二通知人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.YARDID">
<summary>
场站代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.YARD">
<summary>
场站
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.VESSELID">
<summary>
船舶呼号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.VESSEL">
<summary>
船名
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.VOYNO">
<summary>
海关航次
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.VOYNOINNER">
<summary>
内部航次
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ETD">
<summary>
开船日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ATD">
<summary>
实际开船日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CLOSINGDATE">
<summary>
截港日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CLOSEDOCDATE">
<summary>
截单日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CLOSEVGMDATE">
<summary>
截VGM时间
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ETA">
<summary>
预计到港日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PLACERECEIPTID">
<summary>
收货地代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PLACERECEIPT">
<summary>
收货地
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PORTLOADID">
<summary>
起运港代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PORTLOAD">
<summary>
起运港
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PORTDISCHARGEID">
<summary>
卸货港代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PORTDISCHARGE">
<summary>
卸货港
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PLACEDELIVERYID">
<summary>
交货地代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PLACEDELIVERY">
<summary>
交货地
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DESTINATIONID">
<summary>
目的地代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DESTINATION">
<summary>
目的地
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOBILL">
<summary>
提单份数
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.COPYNOBILLL">
<summary>
副本提单份数
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ISSUETYPE">
<summary>
签单方式
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ISSUEDATE">
<summary>
签单日期
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ISSUEPLACEID">
<summary>
签单地点代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ISSUEPLACE">
<summary>
签单地点
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.BLFRT">
<summary>
付费方式
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PREPARDAT">
<summary>
预付地点
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PAYABLEAT">
<summary>
到付地点
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SERVICE">
<summary>
运输条款
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.MARKS">
<summary>
唛头
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.HSCODE">
<summary>
HS代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DESCRIPTION">
<summary>
货描
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PKGS">
<summary>
件数
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.KINDPKGS">
<summary>
包装
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.KGS">
<summary>
毛重
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CBM">
<summary>
尺码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TOTALNO">
<summary>
件数大写
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CNTRTOTAL">
<summary>
集装箱
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CARRIERID">
<summary>
船公司代号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CARRIER">
<summary>
船公司
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CARGOID">
<summary>
货物标识
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DCLASS">
<summary>
危险品类别
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DUNNO">
<summary>
危险品编号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DPAGE">
<summary>
危险品页号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DLABEL">
<summary>
危险品标签
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.LINKMAN">
<summary>
危险品联系人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TEMPID">
<summary>
温度单位
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TEMPSET">
<summary>
设置温度
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.REEFERF">
<summary>
通风度
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.HUMIDITY">
<summary>
湿度
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TEMPMIN">
<summary>
最低温度
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TEMPMAX">
<summary>
最高温度
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ISCONTAINERSOC">
<summary>
是否SOC箱
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SOREMARK">
<summary>
SO备注
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SIREMARK">
<summary>
SI备注
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.YARDREMARK">
<summary>
场站备注
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.COMPID">
<summary>
公司ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.COMPNAME">
<summary>
公司名称
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERNAME">
<summary>
发货人名称
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERADDR1">
<summary>
发货人地址1
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERADDR2">
<summary>
发货人地址2
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERADDR3">
<summary>
发货人地址3
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERCITY">
<summary>
发货人城市
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERPROVINCE">
<summary>
发货人省份代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERPOSTCODE">
<summary>
发货人邮编
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERCOUNTRY">
<summary>
发货人国家代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERATTN">
<summary>
发货人联系人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERTEL">
<summary>
发货人电话
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEENAME">
<summary>
发货人名称
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEADDR1">
<summary>
发货人地址1
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEADDR2">
<summary>
发货人地址2
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEADDR3">
<summary>
发货人地址3
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEECITY">
<summary>
发货人城市
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEPROVINCE">
<summary>
发货人省份代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEPOSTCODE">
<summary>
发货人邮编
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEERCOUNTRY">
<summary>
发货人国家代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEATTN">
<summary>
发货人联系人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEETEL">
<summary>
发货人电话
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYNAME">
<summary>
通知人名称
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYADDR1">
<summary>
通知人地址1
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYADDR2">
<summary>
通知人地址2
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYADDR3">
<summary>
通知人地址3
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYCITY">
<summary>
通知人城市
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYPROVINCE">
<summary>
通知人省份代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYPOSTCODE">
<summary>
通知人邮编
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYCOUNTRY">
<summary>
通知人国家代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYATTN">
<summary>
通知人联系人
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.NOTIFYPARTYTEL">
<summary>
通知人电话
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PONO">
<summary>
PO号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.OPID">
<summary>
操作id
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DOCID">
<summary>
单证id
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.OP">
<summary>
操作
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.DOC">
<summary>
单证
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SALEID">
<summary>
销售ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SALE">
<summary>
销售
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CUSTSERVICEID">
<summary>
客服ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CUSTSERVICE">
<summary>
客服
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CUSTOMERNAME">
<summary>
客户
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.FORWARDER">
<summary>
订舱代理
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPAGENCY">
<summary>
船代
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CUSTOMSER">
<summary>
报关行
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TRUCKER">
<summary>
车队
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.AGENTID">
<summary>
国外代理
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CUSTOMERID">
<summary>
客户代号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.FORWARDERID">
<summary>
订舱代理ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPAGENCYID">
<summary>
船代ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CUSTOMSERID">
<summary>
报关行ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TRUCKERID">
<summary>
车队ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.AGENTNAME">
<summary>
国外代理名称
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.WEITUO">
<summary>
委托方
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CONSIGNEEDOORADDR">
<summary>
收货人DOOR地址
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SHIPPERDOORADDR">
<summary>
发货人DOOR地址
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.SCACCODE">
<summary>
SCAC代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.ITNCODE">
<summary>
ITN编号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PREPARDATID">
<summary>
预付地点ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.PAYABLEATID">
<summary>
到付地点ID
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.CUSTNO">
<summary>
客户系统编号
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TRANSPORTID">
<summary>
中转港代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.TRANSPORT">
<summary>
中转港
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.THIRDPAYADDR">
<summary>
第三付款地
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.YARDCONTRACTTEL">
<summary>
场站联系人电话
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.YARDCONTRACTEMAIL">
<summary>
场站联系人邮箱
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.FEESELF">
<summary>
费用自结
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.LANECODE">
<summary>
航线代码
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.LANENAME">
<summary>
航线名称
</summary>
</member>
<member name="P:Myshipping.Application.BookingOrderOutput.FREIGHTPAYER">
<summary>
付款方
</summary>
</member>
</members>
</doc>

2
Myshipping.Application/Service/BookingCtn/Dto/BookingCtnDto.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using Myshipping.Core;
namespace Myshipping.Application
@ -118,5 +119,6 @@ namespace Myshipping.Application
/// </summary>
public string REMARK { get; set; }
public List<BookingCtnDetailDto> ctnDetailInputs { get; set; }
}
}

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

@ -189,7 +189,7 @@ namespace Myshipping.Application
var groupList = input.ctnInputs.Where(x => x.CTNNUM > 0).GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}");
input.CNTRTOTAL = string.Join(" / ", groupList);
var entity = input.Adapt<BookingOrder>();
entity.Create();
await _rep.InsertAsync(entity);
foreach (var item in input.ctnInputs)
{
@ -213,16 +213,16 @@ namespace Myshipping.Application
/// <returns></returns>
[SqlSugarUnitOfWork]
[HttpPost("/BookingOrder/delete")]
public async Task Delete(QueryeBookingOrderInput input)
public async Task Delete(long Id)
{
await _rep.UpdateAsync(x=>x.Id==input.Id,x=> new BookingOrder { IsDeleted= true} );
var ctnlist=await _repCtn.AsQueryable().Where(x => x.BILLID == input.Id).Select(x => x.Id).ToListAsync();
await _rep.UpdateAsync(x => x.Id == Id, x => new BookingOrder { IsDeleted = true });
var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == Id).Select(x => x.Id).ToListAsync();
await _repCtn.UpdateAsync(x => x.BILLID == input.Id, x => new BookingCtn { IsDeleted = true });
await _repCtn.UpdateAsync(x => x.BILLID == Id, x => new BookingCtn { IsDeleted = true });
await _ctndetailrep.UpdateAsync(x => ctnlist.Contains((long)x.CTNID), x => new BookingCtnDetail { IsDeleted = true });
_logger.LogInformation(Id + "删除成功！");
}
/// <summary>
@ -231,15 +231,13 @@ namespace Myshipping.Application
/// <param name="input"></param>
/// <returns></returns>
[SqlSugarUnitOfWork]
[HttpPost("/BookingOrder/edit")]
[HttpPost("/BookingOrder/Update")]
public async Task Update(UpdateBookingOrderInput input)
{
var entity = input.Adapt<BookingOrder>();
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == input.Id).Select(x => x.Id).ToListAsync();
await _repCtn.DeleteAsync(x => x.BILLID == input.Id);
await _ctndetailrep.DeleteAsync(x => ctnlist.Contains((long)x.CTNID));
foreach (var item in input.ctnInputs)
{
@ -256,25 +254,30 @@ namespace Myshipping.Application
}
/// <summary>
/// 获取订舱主表
/// 获取订舱明细
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet("/BookingOrder/detail")]
public async Task<BookingOrderOutput> Get([FromQuery] QueryeBookingOrderInput input)
[HttpGet("/BookingOrder/Get")]
public async Task<BookingOrderOutput> Get(long Id)
{
var main = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id);
var list= main.Adapt<BookingOrderOutput>();
BookingOrderOutput list = new BookingOrderOutput();
var main = await _rep.FirstOrDefaultAsync(u => u.Id == Id);
if (main!=null) {
list = main.Adapt<BookingOrderOutput>();
var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == Id).ToListAsync();
var ctninput = ctnlist.Adapt<List<BookingCtnDto>>();
foreach (var item in ctninput)
{
var ctndetaillist = await _ctndetailrep.AsQueryable().Where(x => x.CTNID == item.Id).ToListAsync();
item.ctnDetailInputs = ctndetaillist.Adapt<List<BookingCtnDetailDto>>();
}
list.ctnInputs = ctninput;
}
return list;
}
}
}

152
Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
Unescape Escape View File

@ -12,734 +12,590 @@ namespace Myshipping.Application
/// <summary>
/// 主键
/// </summary>
public long? Id { get; set; }
public long Id { get; set; }
/// <summary>
/// 业务编号
/// </summary>
public string BSNO { get; set; }
/// <summary>
/// 业务状态
/// </summary>
public string BSSTATUS { get; set; }
/// <summary>
/// 业务状态名称
/// </summary>
public string BSSTATUSNAME { get; set; }
/// <summary>
/// 业务日期
/// </summary>
public DateTime? BSDATE { get; set; }
/// <summary>
/// 主提单号
/// </summary>
public string MBLNO { get; set; }
/// <summary>
/// 分提单号
/// </summary>
public string HBLNO { get; set; }
/// <summary>
/// 订舱编号
/// </summary>
public string BOOKINGNO { get; set; }
/// <summary>
/// 合约号
/// </summary>
public string CONTRACTNO { get; set; }
/// <summary>
/// 客户合同号
/// </summary>
public string SERVICECONTRACTNO { get; set; }
/// <summary>
/// 发货人代码
/// </summary>
public string SHIPPERID { get; set; }
/// <summary>
/// 收货人代码
/// </summary>
public string CONSIGNEEID { get; set; }
/// <summary>
/// 通知人代码
/// </summary>
public string NOTIFYPARTYID { get; set; }
/// <summary>
/// 发货人
/// </summary>
public string SHIPPER { get; set; }
/// <summary>
/// 收货人
/// </summary>
public string CONSIGNEE { get; set; }
/// <summary>
/// 通知人
/// </summary>
public string NOTIFYPARTY { get; set; }
/// <summary>
/// 第二通知人
/// </summary>
public string NOTIFYPARTY2 { get; set; }
/// <summary>
/// 场站代码
/// </summary>
public string YARDID { get; set; }
/// <summary>
/// 场站
/// </summary>
public string YARD { get; set; }
/// <summary>
/// 船舶呼号
/// </summary>
public string VESSELID { get; set; }
/// <summary>
/// 船名
/// </summary>
public string VESSEL { get; set; }
/// <summary>
/// 海关航次
/// </summary>
public string VOYNO { get; set; }
/// <summary>
/// 内部航次
/// </summary>
public string VOYNOINNER { get; set; }
/// <summary>
/// 开船日期
/// </summary>
public DateTime? ETD { get; set; }
/// <summary>
/// 实际开船日期
/// </summary>
public DateTime? ATD { get; set; }
/// <summary>
/// 截港日期
/// </summary>
public DateTime? CLOSINGDATE { get; set; }
/// <summary>
/// 截单日期
/// </summary>
public DateTime? CLOSEDOCDATE { get; set; }
/// <summary>
/// 截VGM时间
/// </summary>
public DateTime? CLOSEVGMDATE { get; set; }
/// <summary>
/// 预计到港日期
/// </summary>
public DateTime? ETA { get; set; }
/// <summary>
/// 收货地代码
/// </summary>
public string PLACERECEIPTID { get; set; }
/// <summary>
/// 收货地
/// </summary>
public string PLACERECEIPT { get; set; }
/// <summary>
/// 起运港代码
/// </summary>
public string PORTLOADID { get; set; }
/// <summary>
/// 起运港
/// </summary>
public string PORTLOAD { get; set; }
/// <summary>
/// 卸货港代码
/// </summary>
public string PORTDISCHARGEID { get; set; }
/// <summary>
/// 卸货港
/// </summary>
public string PORTDISCHARGE { get; set; }
/// <summary>
/// 交货地代码
/// </summary>
public string PLACEDELIVERYID { get; set; }
/// <summary>
/// 交货地
/// </summary>
public string PLACEDELIVERY { get; set; }
/// <summary>
/// 目的地代码
/// </summary>
public string DESTINATIONID { get; set; }
/// <summary>
/// 目的地
/// </summary>
public string DESTINATION { get; set; }
/// <summary>
/// 提单份数
/// </summary>
public string NOBILL { get; set; }
/// <summary>
/// 副本提单份数
/// </summary>
public string COPYNOBILLL { get; set; }
/// <summary>
/// 签单方式
/// </summary>
public string ISSUETYPE { get; set; }
/// <summary>
/// 签单日期
/// </summary>
public DateTime? ISSUEDATE { get; set; }
/// <summary>
/// 签单地点代码
/// </summary>
public string ISSUEPLACEID { get; set; }
/// <summary>
/// 签单地点
/// </summary>
public string ISSUEPLACE { get; set; }
/// <summary>
/// 付费方式
/// </summary>
public string BLFRT { get; set; }
/// <summary>
/// 预付地点
/// </summary>
public string PREPARDAT { get; set; }
/// <summary>
/// 到付地点
/// </summary>
public string PAYABLEAT { get; set; }
/// <summary>
/// 运输条款
/// </summary>
public string SERVICE { get; set; }
/// <summary>
/// 唛头
/// </summary>
public string MARKS { get; set; }
/// <summary>
/// HS代码
/// </summary>
public string HSCODE { get; set; }
/// <summary>
/// 货描
/// </summary>
public string DESCRIPTION { get; set; }
/// <summary>
/// 件数
/// </summary>
public int? PKGS { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KINDPKGS { get; set; }
/// <summary>
/// 毛重
/// </summary>
public decimal? KGS { get; set; }
/// <summary>
/// 尺码
/// </summary>
public decimal? CBM { get; set; }
/// <summary>
/// 件数大写
/// </summary>
public string TOTALNO { get; set; }
/// <summary>
/// 集装箱
/// </summary>
public string CNTRTOTAL { get; set; }
/// <summary>
/// 船公司代号
/// </summary>
public string CARRIERID { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string CARRIER { get; set; }
/// <summary>
/// 货物标识
/// </summary>
public string CARGOID { get; set; }
/// <summary>
/// 危险品类别
/// </summary>
public string DCLASS { get; set; }
/// <summary>
/// 危险品编号
/// </summary>
public string DUNNO { get; set; }
/// <summary>
/// 危险品页号
/// </summary>
public string DPAGE { get; set; }
/// <summary>
/// 危险品标签
/// </summary>
public string DLABEL { get; set; }
/// <summary>
/// 危险品联系人
/// </summary>
public string LINKMAN { get; set; }
/// <summary>
/// 温度单位
/// </summary>
public string TEMPID { get; set; }
/// <summary>
/// 设置温度
/// </summary>
public string TEMPSET { get; set; }
/// <summary>
/// 通风度
/// </summary>
public string REEFERF { get; set; }
/// <summary>
/// 湿度
/// </summary>
public string HUMIDITY { get; set; }
/// <summary>
/// 最低温度
/// </summary>
public string TEMPMIN { get; set; }
/// <summary>
/// 最高温度
/// </summary>
public string TEMPMAX { get; set; }
/// <summary>
/// 是否SOC箱
/// </summary>
public bool? ISCONTAINERSOC { get; set; }
/// <summary>
/// SO备注
/// </summary>
public string SOREMARK { get; set; }
/// <summary>
/// SI备注
/// </summary>
public string SIREMARK { get; set; }
/// <summary>
/// 场站备注
/// </summary>
public string YARDREMARK { get; set; }
/// <summary>
/// 公司ID
/// </summary>
public string COMPID { get; set; }
/// <summary>
/// 公司名称
/// </summary>
public string COMPNAME { get; set; }
/// <summary>
/// 发货人名称
/// </summary>
public string SHIPPERNAME { get; set; }
/// <summary>
/// 发货人地址1
/// </summary>
public string SHIPPERADDR1 { get; set; }
/// <summary>
/// 发货人地址2
/// </summary>
public string SHIPPERADDR2 { get; set; }
/// <summary>
/// 发货人地址3
/// </summary>
public string SHIPPERADDR3 { get; set; }
/// <summary>
/// 发货人城市
/// </summary>
public string SHIPPERCITY { get; set; }
/// <summary>
/// 发货人省份代码
/// </summary>
public string SHIPPERPROVINCE { get; set; }
/// <summary>
/// 发货人邮编
/// </summary>
public string SHIPPERPOSTCODE { get; set; }
/// <summary>
/// 发货人国家代码
/// </summary>
public string SHIPPERCOUNTRY { get; set; }
/// <summary>
/// 发货人联系人
/// </summary>
public string SHIPPERATTN { get; set; }
/// <summary>
/// 发货人电话
/// </summary>
public string SHIPPERTEL { get; set; }
/// <summary>
/// 发货人名称
/// </summary>
public string CONSIGNEENAME { get; set; }
/// <summary>
/// 发货人地址1
/// </summary>
public string CONSIGNEEADDR1 { get; set; }
/// <summary>
/// 发货人地址2
/// </summary>
public string CONSIGNEEADDR2 { get; set; }
/// <summary>
/// 发货人地址3
/// </summary>
public string CONSIGNEEADDR3 { get; set; }
/// <summary>
/// 发货人城市
/// </summary>
public string CONSIGNEECITY { get; set; }
/// <summary>
/// 发货人省份代码
/// </summary>
public string CONSIGNEEPROVINCE { get; set; }
/// <summary>
/// 发货人邮编
/// </summary>
public string CONSIGNEEPOSTCODE { get; set; }
/// <summary>
/// 发货人国家代码
/// </summary>
public string CONSIGNEERCOUNTRY { get; set; }
/// <summary>
/// 发货人联系人
/// </summary>
public string CONSIGNEEATTN { get; set; }
/// <summary>
/// 发货人电话
/// </summary>
public string CONSIGNEETEL { get; set; }
/// <summary>
/// 通知人名称
/// </summary>
public string NOTIFYPARTYNAME { get; set; }
/// <summary>
/// 通知人地址1
/// </summary>
public string NOTIFYPARTYADDR1 { get; set; }
/// <summary>
/// 通知人地址2
/// </summary>
public string NOTIFYPARTYADDR2 { get; set; }
/// <summary>
/// 通知人地址3
/// </summary>
public string NOTIFYPARTYADDR3 { get; set; }
/// <summary>
/// 通知人城市
/// </summary>
public string NOTIFYPARTYCITY { get; set; }
/// <summary>
/// 通知人省份代码
/// </summary>
public string NOTIFYPARTYPROVINCE { get; set; }
/// <summary>
/// 通知人邮编
/// </summary>
public string NOTIFYPARTYPOSTCODE { get; set; }
/// <summary>
/// 通知人国家代码
/// </summary>
public string NOTIFYPARTYCOUNTRY { get; set; }
/// <summary>
/// 通知人联系人
/// </summary>
public string NOTIFYPARTYATTN { get; set; }
/// <summary>
/// 通知人电话
/// </summary>
public string NOTIFYPARTYTEL { get; set; }
/// <summary>
/// PO号
/// </summary>
public string PONO { get; set; }
/// <summary>
/// 操作id
/// </summary>
public string OPID { get; set; }
/// <summary>
/// 单证id
/// </summary>
public string DOCID { get; set; }
/// <summary>
/// 操作
/// </summary>
public string OP { get; set; }
/// <summary>
/// 单证
/// </summary>
public string DOC { get; set; }
/// <summary>
/// 销售ID
/// </summary>
public string SALEID { get; set; }
/// <summary>
/// 销售
/// </summary>
public string SALE { get; set; }
/// <summary>
/// 客服ID
/// </summary>
public string CUSTSERVICEID { get; set; }
/// <summary>
/// 客服
/// </summary>
public string CUSTSERVICE { get; set; }
/// <summary>
/// 客户
/// </summary>
public string CUSTOMERNAME { get; set; }
/// <summary>
/// 订舱代理
/// </summary>
public string FORWARDER { get; set; }
/// <summary>
/// 船代
/// </summary>
public string SHIPAGENCY { get; set; }
/// <summary>
/// 报关行
/// </summary>
public string CUSTOMSER { get; set; }
/// <summary>
/// 车队
/// </summary>
public string TRUCKER { get; set; }
/// <summary>
/// 国外代理
/// </summary>
public string AGENTID { get; set; }
/// <summary>
/// 客户代号
/// 客户ID
/// </summary>
public string CUSTOMERID { get; set; }
public long? CUSTOMERID { get; set; }
/// <summary>
/// 订舱代理ID
/// </summary>
public string FORWARDERID { get; set; }
/// <summary>
/// 船代ID
/// </summary>
public string SHIPAGENCYID { get; set; }
/// <summary>
/// 报关行ID
/// </summary>
public string CUSTOMSERID { get; set; }
/// <summary>
/// 车队ID
/// </summary>
public string TRUCKERID { get; set; }
/// <summary>
/// 国外代理名称
/// </summary>
public string AGENTNAME { get; set; }
/// <summary>
/// 委托方
/// </summary>
public string WEITUO { get; set; }
/// <summary>
/// 收货人DOOR地址
/// </summary>
public string CONSIGNEEDOORADDR { get; set; }
/// <summary>
/// 发货人DOOR地址
/// </summary>
public string SHIPPERDOORADDR { get; set; }
/// <summary>
/// SCAC代码
/// </summary>
public string SCACCODE { get; set; }
/// <summary>
/// ITN编号
/// </summary>
public string ITNCODE { get; set; }
/// <summary>
/// 预付地点ID
/// </summary>
public string PREPARDATID { get; set; }
/// <summary>
/// 到付地点ID
/// </summary>
public string PAYABLEATID { get; set; }
/// <summary>
/// 客户系统编号
/// </summary>
public string CUSTNO { get; set; }
/// <summary>
/// 中转港代码
/// </summary>
public string TRANSPORTID { get; set; }
/// <summary>
/// 中转港
/// </summary>
public string TRANSPORT { get; set; }
/// <summary>
/// 第三付款地
/// </summary>
public string THIRDPAYADDR { get; set; }
/// <summary>
/// 场站联系人电话
/// </summary>
public string YARDCONTRACTTEL { get; set; }
/// <summary>
/// 场站联系人邮箱
/// </summary>
public string YARDCONTRACTEMAIL { get; set; }
/// <summary>
/// 费用自结
/// </summary>
public bool? FEESELF { get; set; }
/// <summary>
/// 航线代码
/// </summary>
public string LANECODE { get; set; }
/// <summary>
/// 航线名称
/// </summary>
public string LANENAME { get; set; }
/// <summary>
/// 付款方
/// </summary>
public string FREIGHTPAYER { get; set; }
public List<AddBookingCtnInput> ctnInputs { get; set; }
public List<BookingCtnDto> ctnInputs { get; set; }
}
}

15
Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs
Unescape Escape View File

@ -742,22 +742,11 @@ namespace Myshipping.Application
}
public class QueryeBookingOrderInput
{
/// <summary>
/// 主键
/// </summary>
[Required(ErrorMessage = "主键不能为空")]
public long Id { get; set; }
}
public class UpdateBookingOrderInput : BookingOrderDto
{
/// <summary>
/// 主键
/// </summary>
[Required(ErrorMessage = "主键不能为空")]
public long Id { get; set; }
}

8
Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs
Unescape Escape View File

@ -7,9 +7,11 @@ namespace Myshipping.Application
public interface IBookingOrderService
{
Task Add(AddBookingOrderInput input);
Task Delete(DeleteBookingOrderInput input);
Task<BookingOrder> Get([FromQuery] QueryeBookingOrderInput input);
Task<dynamic> Page([FromQuery] BookingOrderInput input);
Task Delete(long Id);
Task Update(UpdateBookingOrderInput input);
Task<BookingOrderOutput> Get(long Id);
Task<dynamic> Page([FromQuery] BookingOrderInput input);
}
}

46
Myshipping.Core/Entity/DEntityBase.cs
Unescape Escape View File

@ -57,30 +57,30 @@ public abstract class DEntityBase : PrimaryKeyEntity
public virtual bool IsDeleted { get; set; } = false;
public virtual void Create()
{
var userId = App.User.FindFirst(ClaimConst.CLAINM_USERID)?.Value;
var userName = App.User.FindFirst(ClaimConst.CLAINM_ACCOUNT)?.Value;
Id = YitIdHelper.NextId();
CreatedTime = DateTime.Now;
if (!string.IsNullOrEmpty(userId))
{
CreatedUserId = long.Parse(userId);
CreatedUserName = userName;
}
}
//public virtual void Create()
//{
// var userId = App.User.FindFirst(ClaimConst.CLAINM_USERID)?.Value;
// var userName = App.User.FindFirst(ClaimConst.CLAINM_ACCOUNT)?.Value;
// Id = YitIdHelper.NextId();
// CreatedTime = DateTime.Now;
// if (!string.IsNullOrEmpty(userId))
// {
// CreatedUserId = long.Parse(userId);
// CreatedUserName = userName;
// }
//}
public void Modify()
{
var userId = App.User.FindFirst(ClaimConst.CLAINM_USERID)?.Value;
var userName = App.User.FindFirst(ClaimConst.CLAINM_ACCOUNT)?.Value;
UpdatedTime = DateTime.Now;
if (!string.IsNullOrEmpty(userId))
{
UpdatedUserId = long.Parse(userId);
UpdatedUserName = userName;
}
}
//public void Modify()
//{
// var userId = App.User.FindFirst(ClaimConst.CLAINM_USERID)?.Value;
// var userName = App.User.FindFirst(ClaimConst.CLAINM_ACCOUNT)?.Value;
// UpdatedTime = DateTime.Now;
// if (!string.IsNullOrEmpty(userId))
// {
// UpdatedUserId = long.Parse(userId);
// UpdatedUserName = userName;
// }
//}
/// <summary>
/// 更新信息列

18
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -12449,6 +12449,24 @@
<param name="list2"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.JsonUtil.PropToUpper(System.Object,System.String[])">
<summary>
处理输入的数据，变为大写，全角改为半角
</summary>
<param name="model">数据对象</param>
<param name="excepProp">不需要转大写的字段</param>
</member>
<member name="M:Myshipping.Core.JsonUtil.MinDateToNull(System.Object)">
<summary>
处理所有时间字段，将Datetime.Min设置为null
</summary>
<param name="model"></param>
</member>
<member name="M:Myshipping.Core.JsonUtil.TrimFields(System.Object)">
<summary>
去空格
</summary>
</member>
<member name="T:Myshipping.Core.MachineUtil">
<summary>
获取服务器信息

Write Preview
Loading…
Cancel
Save