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 8ea6c558d6 5c246fa570
commit 4fea1be62f
10 changed files with 2217 additions and 15 deletions
Show Stats Download Patch File Download Diff File

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

@ -32,6 +32,11 @@ namespace Myshipping.Application.Entity
/// </summary> /// </summary>
public string STATUS { get; set; } public string STATUS { get; set; }
/// <summary>
/// 状态名称 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起
/// </summary>
public string STATUS_NAME { get; set; }
/// <summary> /// <summary>
/// 任务标题 /// 任务标题
/// </summary> /// </summary>

18
Myshipping.Application/Entity/TaskManagePlat/TaskManageDbEntity.cs
Unescape Escape View File

@ -20,46 +20,46 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public virtual DateTime CreatedTime { get; set; } public DateTime CreatedTime { get; set; }
/// <summary> /// <summary>
/// 修改时间 /// 修改时间
/// </summary> /// </summary>
public virtual DateTime? UpdatedTime { get; set; } public DateTime? UpdatedTime { get; set; }
/// <summary> /// <summary>
/// 创建人ID /// 创建人ID
/// </summary> /// </summary>
public virtual long CreatedUserId { get; set; } public long CreatedUserId { get; set; }
/// <summary> /// <summary>
/// 创建人名称 /// 创建人名称
/// </summary> /// </summary>
public virtual string CreatedUserName { get; set; } public string CreatedUserName { get; set; }
/// <summary> /// <summary>
/// 修改人ID /// 修改人ID
/// </summary> /// </summary>
public virtual long UpdatedUserId { get; set; } public long UpdatedUserId { get; set; }
/// <summary> /// <summary>
/// 修改人名称 /// 修改人名称
/// </summary> /// </summary>
public virtual string UpdatedUserName { get; set; } public string UpdatedUserName { get; set; }
/// <summary> /// <summary>
/// 租户id /// 租户id
/// </summary> /// </summary>
public virtual long? TenantId { get; set; } public long? TenantId { get; set; }
/// <summary> /// <summary>
/// 租户名称 /// 租户名称
/// </summary> /// </summary>
public virtual string TenantName { get; set; } public string TenantName { get; set; }
/// <summary> /// <summary>
/// 软删除 /// 软删除
/// </summary> /// </summary>
public virtual bool IsDeleted { get; set; } = false; public bool IsDeleted { get; set; } = false;
} }
} }

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

@ -3708,6 +3708,11 @@
状态 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起 状态 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.Entity.TaskBaseInfo.STATUS_NAME">
<summary>
状态名称 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起
</summary>
</member>
<member name="P:Myshipping.Application.Entity.TaskBaseInfo.TASK_TITLE"> <member name="P:Myshipping.Application.Entity.TaskBaseInfo.TASK_TITLE">
<summary> <summary>
任务标题 任务标题
@ -11242,7 +11247,7 @@
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Myshipping.Application.BookingPrintTemplateService.GetPrinttemplateRightList(System.Int64,System.String,System.String,System.String)"> <member name="M:Myshipping.Application.BookingPrintTemplateService.GetPrinttemplateRightList(System.Int64,System.String,System.String)">
<summary> <summary>
获取打印模板权限 获取打印模板权限
</summary> </summary>
@ -13876,6 +13881,11 @@
状态 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起 状态 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.TaskBaseInfoDto.StatusName">
<summary>
状态名称 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起
</summary>
</member>
<member name="P:Myshipping.Application.TaskBaseInfoDto.TaskTitle"> <member name="P:Myshipping.Application.TaskBaseInfoDto.TaskTitle">
<summary> <summary>
任务标题 任务标题
@ -13996,6 +14006,951 @@
租户名称 租户名称
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.PKGs">
<summary>
件数
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.KindPKGs">
<summary>
包装
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.KGs">
<summary>
毛重
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.CBM">
<summary>
尺码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.HSCode">
<summary>
HS编码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.Marks">
<summary>
唛头
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.Description">
<summary>
货描
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderCargoDto.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.ContaType">
<summary>
箱型代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.ContaTypeName">
<summary>
箱型
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.TEU">
<summary>
TEU
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.ContaNo">
<summary>
箱号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.SealNo">
<summary>
封号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.PKGs">
<summary>
件数
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.KindPKGs">
<summary>
包装
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.KGs">
<summary>
毛重
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.CBM">
<summary>
尺码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.TareWeight">
<summary>
皮重
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.ContaStatus">
<summary>
箱状态
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.WeighType">
<summary>
称重方式
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.WeighKGs">
<summary>
称重重量
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.WeighAttn">
<summary>
称重联系人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.VGMConnCom">
<summary>
VGM联系公司
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.WeighTel">
<summary>
VGM联系电话
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.WeighDate">
<summary>
称重日期
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.VGMAddr">
<summary>
VGM地址
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.VGMEmail">
<summary>
VGM邮箱
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.ContaCategory">
<summary>
大小箱分类（small-小箱 big-大箱）
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderContaDto.CargoList">
<summary>
货物明细
</summary>
</member>
<member name="T:Myshipping.Application.TaskBookingOrderDto">
<summary>
订舱详情
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.MasterBlNo">
<summary>
主提单号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.HouseBlNo">
<summary>
分提单号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.BookingNo">
<summary>
订舱编号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ContrNo">
<summary>
合约号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ServContrNo">
<summary>
客户合同号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperId">
<summary>
发货人代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeId">
<summary>
收货人代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyId">
<summary>
通知人代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Shipper">
<summary>
发货人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Consignee">
<summary>
收货人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyParty">
<summary>
通知人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPrt2">
<summary>
第二通知人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.YardId">
<summary>
场站代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Yard">
<summary>
场站名称
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.VesselId">
<summary>
船舶呼号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Vessel">
<summary>
船名
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Voyno">
<summary>
海关航次
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.VoynoIn">
<summary>
内部航次
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ETD">
<summary>
开船日期
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ATD">
<summary>
实际开船日期
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ETA">
<summary>
预计到港日期
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ClosingDate">
<summary>
截港日期
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CloseDocDate">
<summary>
截单日期
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CloseVGMDate">
<summary>
截VGM时间
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PlaceReceiptId">
<summary>
收货地代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PlaceReceipt">
<summary>
收货地
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PortLoadId">
<summary>
起运港代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PortLoad">
<summary>
起运港
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PortDischargeId">
<summary>
卸货港代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PortDischarge">
<summary>
卸货港
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PlaceDeliveryId">
<summary>
交货地代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PlaceDelivery">
<summary>
交货地
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.DestinationId">
<summary>
目的地代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Destination">
<summary>
目的地
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NoBill">
<summary>
提单份数
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CopyNoBill">
<summary>
副本提单份数
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IssueType">
<summary>
签单方式 1-Seaway 2-正本 3-电放
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IssueDate">
<summary>
签单日期
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IssuePlaceId">
<summary>
签单地点代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IssuePlace">
<summary>
签单地点
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Blfrt">
<summary>
付费方式
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PrepardAt">
<summary>
预付地点
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PayableAt">
<summary>
到付地点
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Service">
<summary>
运输条款
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Marks">
<summary>
唛头
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.HsCode">
<summary>
HS代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.GoodsDescription">
<summary>
货描
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PKGs">
<summary>
件数
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.KindPKGs">
<summary>
包装
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.KGs">
<summary>
毛重
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CBM">
<summary>
尺码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TotalNO">
<summary>
件数大写
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CntrTotal">
<summary>
集装箱
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CarrierId">
<summary>
船公司代号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CargoId">
<summary>
货物标识
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.DClass">
<summary>
危险品类别
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.DUnno">
<summary>
危险品编号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.DPage">
<summary>
危险品页号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.DLabel">
<summary>
危险品标签
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.DLinkMan">
<summary>
危险品联系人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TempId">
<summary>
温度单位
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TempSet">
<summary>
设置温度
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Reeferf">
<summary>
通风度
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Humidity">
<summary>
湿度
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TempMin">
<summary>
最低温度
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TempMax">
<summary>
最高温度
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IsContaSOC">
<summary>
是否SOC箱
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.SORemark">
<summary>
SO备注
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.SIRemark">
<summary>
SI备注
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.YardRemark">
<summary>
场站备注
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CompId">
<summary>
公司ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CompName">
<summary>
公司名称
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperName">
<summary>
发货人名称
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperAddr1">
<summary>
发货人地址1
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperAddr2">
<summary>
发货人地址2
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperAddr3">
<summary>
发货人地址3
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperCity">
<summary>
发货人城市
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperProvice">
<summary>
发货人省份代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperPostCode">
<summary>
发货人邮编
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperCountry">
<summary>
发货人国家代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperAttn">
<summary>
发货人联系人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperTel">
<summary>
发货人电话
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeName">
<summary>
收货人名称
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeAddr1">
<summary>
收货人地址1
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeAddr2">
<summary>
收货人地址2
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeAddr3">
<summary>
收货人地址3
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeCity">
<summary>
收货人城市
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeProvince">
<summary>
收货人省份代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneePostCode">
<summary>
收货人邮编
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeCountry">
<summary>
收货人国家代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeAttn">
<summary>
收货人联系人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeTel">
<summary>
收货人电话
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyName">
<summary>
通知人名称
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyAddr1">
<summary>
通知人地址1
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyAddr2">
<summary>
通知人地址2
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyAddr3">
<summary>
通知人地址3
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyCity">
<summary>
通知人城市
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyProvince">
<summary>
通知人省份代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyPostCode">
<summary>
通知人邮编
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyCountry">
<summary>
通知人国家代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyAttn">
<summary>
通知人联系人
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyTel">
<summary>
通知人电话
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PONo">
<summary>
PO号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.OPID">
<summary>
操作id
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.DOCID">
<summary>
单证id
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.OP">
<summary>
操作
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Doc">
<summary>
单证
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.SaleId">
<summary>
销售ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Sale">
<summary>
销售
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CustserviceId">
<summary>
客服ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Custservice">
<summary>
客服
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CustserviceName">
<summary>
客户
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Forwarder">
<summary>
订舱代理
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipAgency">
<summary>
船代
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CustomsER">
<summary>
报关行
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TruckER">
<summary>
车队
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.AgentId">
<summary>
国外代理
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CustomerId">
<summary>
客户ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ForwarderId">
<summary>
订舱代理ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipAgencyId">
<summary>
船代ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CustomsERId">
<summary>
报关行ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TruckERId">
<summary>
车队ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.AgentName">
<summary>
国外代理名称
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.WeiTo">
<summary>
委托方
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeDoorAddr">
<summary>
收货人DOOR地址
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperDoorAddr">
<summary>
发货人DOOR地址
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.SCACCode">
<summary>
SCAC代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ITNCode">
<summary>
ITN编号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PrePardAtId">
<summary>
预付地点ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PayableAtId">
<summary>
到付地点ID
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.CustNo">
<summary>
客户系统编号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TransportId">
<summary>
中转港代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.Transport">
<summary>
中转港
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ThirdPayAddr">
<summary>
第三付款地
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.YardContractTel">
<summary>
场站联系人电话
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.YardContractEmail">
<summary>
场站联系人邮箱
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.FeeSelf">
<summary>
费用自结
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.LaneCode">
<summary>
航线代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.LaneName">
<summary>
航线名称
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.FreightPayer">
<summary>
付款方
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ShipperTaxNo">
<summary>
发货人税号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ConsigneeTaxNo">
<summary>
收货人税号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.NotifyPartyTaxNo">
<summary>
通知人税号
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IsATDChangeIssueType">
<summary>
是否船开后变更签单方式 1-是 0-否
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IsEngChinaLineBar">
<summary>
是否条形中英文章
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IsDoubleShipper">
<summary>
是否双Shipper
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IsFCLAndLCLMix">
<summary>
是否整箱和拼箱混合
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IsMutipleGoods">
<summary>
是否多品名
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.IsContaLCL">
<summary>
是否拼箱
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PortDischargeCountryNo">
<summary>
卸货港国家代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PortDischargeEN">
<summary>
卸货港国家英文
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.PortDischargeCN">
<summary>
卸货港国家中文
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TransportCountryNo">
<summary>
中转港国家代码
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TransportEN">
<summary>
中转港国家英文
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TransportCN">
<summary>
中转港国家中文
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.ContaList">
<summary>
箱信息
</summary>
</member>
<member name="P:Myshipping.Application.TaskBookingOrderDto.TaskBaseInfo">
<summary>
任务详情
</summary>
</member>
<member name="T:Myshipping.Application.TaskManageOrderFeeInfo"> <member name="T:Myshipping.Application.TaskManageOrderFeeInfo">
<summary> <summary>
费用明细 费用明细

5
Myshipping.Application/Service/TaskManagePlat/Dtos/TaskBaseInfoDto.cs
Unescape Escape View File

@ -35,6 +35,11 @@ namespace Myshipping.Application
/// </summary> /// </summary>
public string Status { get; set; } public string Status { get; set; }
/// <summary>
/// 状态名称 Create-待处理；Retransmit-已转发；Complete-已完成；Cancel-已取消；Pending-已挂起
/// </summary>
public string StatusName { get; set; }
/// <summary> /// <summary>
/// 任务标题 /// 任务标题
/// </summary> /// </summary>

44
Myshipping.Application/Service/TaskManagePlat/Dtos/TaskBookingOrderCargoDto.cs
Unescape Escape View File

@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application
{
public class TaskBookingOrderCargoDto
{
/// <summary>
/// 件数
/// </summary>
public Nullable<int> PKGs { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KindPKGs { get; set; }
/// <summary>
/// 毛重
/// </summary>
public Nullable<decimal> KGs { get; set; }
/// <summary>
/// 尺码
/// </summary>
public Nullable<decimal> CBM { get; set; }
/// <summary>
/// HS编码
/// </summary>
public string HSCode { get; set; }
/// <summary>
/// 唛头
/// </summary>
public string Marks { get; set; }
/// <summary>
/// 货描
/// </summary>
public string Description { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

102
Myshipping.Application/Service/TaskManagePlat/Dtos/TaskBookingOrderContaDto.cs
Unescape Escape View File

@ -0,0 +1,102 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application
{
public class TaskBookingOrderContaDto
{
/// <summary>
/// 箱型代码
/// </summary>
public string ContaType { get; set; }
/// <summary>
/// 箱型
/// </summary>
public string ContaTypeName { get; set; }
/// <summary>
/// TEU
/// </summary>
public Nullable<int> TEU { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string ContaNo { get; set; }
/// <summary>
/// 封号
/// </summary>
public string SealNo { get; set; }
/// <summary>
/// 件数
/// </summary>
public Nullable<int> PKGs { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KindPKGs { get; set; }
/// <summary>
/// 毛重
/// </summary>
public Nullable<decimal> KGs { get; set; }
/// <summary>
/// 尺码
/// </summary>
public Nullable<decimal> CBM { get; set; }
/// <summary>
/// 皮重
/// </summary>
public Nullable<decimal> TareWeight { get; set; }
/// <summary>
/// 箱状态
/// </summary>
public string ContaStatus { get; set; }
/// <summary>
/// 称重方式
/// </summary>
public string WeighType { get; set; }
/// <summary>
/// 称重重量
/// </summary>
public Nullable<decimal> WeighKGs { get; set; }
/// <summary>
/// 称重联系人
/// </summary>
public string WeighAttn { get; set; }
/// <summary>
/// VGM联系公司
/// </summary>
public string VGMConnCom { get; set; }
/// <summary>
/// VGM联系电话
/// </summary>
public string WeighTel { get; set; }
/// <summary>
/// 称重日期
/// </summary>
public string WeighDate { get; set; }
/// <summary>
/// VGM地址
/// </summary>
public string VGMAddr { get; set; }
/// <summary>
/// VGM邮箱
/// </summary>
public string VGMEmail { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 大小箱分类（small-小箱 big-大箱）
/// </summary>
public string ContaCategory { get; set; }
/// <summary>
/// 货物明细
/// </summary>
public List<TaskBookingOrderCargoDto> CargoList { get; set; }
}
}

666
Myshipping.Application/Service/TaskManagePlat/Dtos/TaskBookingOrderDto.cs
Unescape Escape View File

@ -0,0 +1,666 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application
{
/// <summary>
/// 订舱详情
/// </summary>
public class TaskBookingOrderDto
{
/// <summary>
/// 主提单号
/// </summary>
public string MasterBlNo { get; set; }
/// <summary>
/// 分提单号
/// </summary>
public string HouseBlNo { get; set; }
/// <summary>
/// 订舱编号
/// </summary>
public string BookingNo { get; set; }
/// <summary>
/// 合约号
/// </summary>
public string ContrNo { get; set; }
/// <summary>
/// 客户合同号
/// </summary>
public string ServContrNo { 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 NotifyPrt2 { 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 VoynoIn { get; set; }
/// <summary>
/// 开船日期
/// </summary>
public string ETD { get; set; }
/// <summary>
/// 实际开船日期
/// </summary>
public string ATD { get; set; }
/// <summary>
/// 预计到港日期
/// </summary>
public string ETA { get; set; }
/// <summary>
/// 截港日期
/// </summary>
public string ClosingDate { get; set; }
/// <summary>
/// 截单日期
/// </summary>
public string CloseDocDate { get; set; }
/// <summary>
/// 截VGM时间
/// </summary>
public string CloseVGMDate { 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 CopyNoBill { get; set; }
/// <summary>
/// 签单方式 1-Seaway 2-正本 3-电放
/// </summary>
public string IssueType { get; set; }
/// <summary>
/// 签单日期
/// </summary>
public string 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 GoodsDescription { get; set; }
/// <summary>
/// 件数
/// </summary>
public Nullable<int> PKGs { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KindPKGs { get; set; }
/// <summary>
/// 毛重
/// </summary>
public Nullable<decimal> KGs { get; set; }
/// <summary>
/// 尺码
/// </summary>
public Nullable<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 DLinkMan { 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 Nullable<bool> IsContaSOC { 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 ShipperProvice { 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 ConsigneeCountry { 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 CustserviceName { 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 Nullable<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 WeiTo { 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 Nullable<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; }
/// <summary>
/// 发货人税号
/// </summary>
public string ShipperTaxNo { get; set; }
/// <summary>
/// 收货人税号
/// </summary>
public string ConsigneeTaxNo { get; set; }
/// <summary>
/// 通知人税号
/// </summary>
public string NotifyPartyTaxNo { get; set; }
/// <summary>
/// 是否船开后变更签单方式 1-是 0-否
/// </summary>
public Nullable<bool> IsATDChangeIssueType { get; set; }
/// <summary>
/// 是否条形中英文章
/// </summary>
public Nullable<bool> IsEngChinaLineBar { get; set; }
/// <summary>
/// 是否双Shipper
/// </summary>
public Nullable<bool> IsDoubleShipper { get; set; }
/// <summary>
/// 是否整箱和拼箱混合
/// </summary>
public Nullable<bool> IsFCLAndLCLMix { get; set; }
/// <summary>
/// 是否多品名
/// </summary>
public Nullable<bool> IsMutipleGoods { get; set; }
/// <summary>
/// 是否拼箱
/// </summary>
public Nullable<bool> IsContaLCL { get; set; }
/// <summary>
/// 卸货港国家代码
/// </summary>
public string PortDischargeCountryNo { get; set; }
/// <summary>
/// 卸货港国家英文
/// </summary>
public string PortDischargeEN { get; set; }
/// <summary>
/// 卸货港国家中文
/// </summary>
public string PortDischargeCN { get; set; }
/// <summary>
/// 中转港国家代码
/// </summary>
public string TransportCountryNo { get; set; }
/// <summary>
/// 中转港国家英文
/// </summary>
public string TransportEN { get; set; }
/// <summary>
/// 中转港国家中文
/// </summary>
public string TransportCN { get; set; }
/// <summary>
/// 箱信息
/// </summary>
public List<TaskBookingOrderContaDto> ContaList { get; set; }
/// <summary>
/// 任务详情
/// </summary>
public TaskBaseInfoDto TaskBaseInfo { get; set; }
}
}

163
Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageMapper.cs
Unescape Escape View File

@ -80,6 +80,7 @@ namespace Myshipping.Application
.Map(dest => dest.TaskType, src => src.TASK_TYPE) .Map(dest => dest.TaskType, src => src.TASK_TYPE)
.Map(dest => dest.TaskSource, src => src.TASK_SOURCE) .Map(dest => dest.TaskSource, src => src.TASK_SOURCE)
.Map(dest => dest.Status, src => src.STATUS) .Map(dest => dest.Status, src => src.STATUS)
.Map(dest => dest.StatusName, src => src.STATUS_NAME)
.Map(dest => dest.TaskTitle, src => src.TASK_TITLE) .Map(dest => dest.TaskTitle, src => src.TASK_TITLE)
.Map(dest => dest.TaskDesp, src => src.TASK_DESP) .Map(dest => dest.TaskDesp, src => src.TASK_DESP)
.Map(dest => dest.OutBusiNo, src => src.OUT_BUSI_NO) .Map(dest => dest.OutBusiNo, src => src.OUT_BUSI_NO)
@ -107,7 +108,6 @@ namespace Myshipping.Application
.Map(dest => dest.TASK_NO, src => src.TaskNo) .Map(dest => dest.TASK_NO, src => src.TaskNo)
.Map(dest => dest.TASK_TYPE, src => src.TaskType) .Map(dest => dest.TASK_TYPE, src => src.TaskType)
.Map(dest => dest.TASK_SOURCE, src => src.TaskSource) .Map(dest => dest.TASK_SOURCE, src => src.TaskSource)
.Map(dest => dest.STATUS, src => src.Status)
.Map(dest => dest.TASK_TITLE, src => src.TaskTitle) .Map(dest => dest.TASK_TITLE, src => src.TaskTitle)
.Map(dest => dest.TASK_DESP, src => src.TaskDesp) .Map(dest => dest.TASK_DESP, src => src.TaskDesp)
.Map(dest => dest.OUT_BUSI_NO, src => src.OutBusiNo) .Map(dest => dest.OUT_BUSI_NO, src => src.OutBusiNo)
@ -129,6 +129,167 @@ namespace Myshipping.Application
.Map(dest => dest.CreatedUserName, src => src.CreatedUserName) .Map(dest => dest.CreatedUserName, src => src.CreatedUserName)
.Map(dest => dest.UpdatedUserId, src => src.UpdatedUserId) .Map(dest => dest.UpdatedUserId, src => src.UpdatedUserId)
.Map(dest => dest.UpdatedUserName, src => src.UpdatedUserName); .Map(dest => dest.UpdatedUserName, src => src.UpdatedUserName);
config.ForType<BookingOrder, TaskBookingOrderDto>()
.Map(dest => dest.MasterBlNo, src => src.MBLNO)
.Map(dest => dest.HouseBlNo, src => src.HBLNO)
.Map(dest => dest.BookingNo, src => src.BOOKINGNO)
.Map(dest => dest.ContrNo, src => src.CONTRACTNO)
.Map(dest => dest.ServContrNo, src => src.SERVICECONTRACTNO)
.Map(dest => dest.ShipperId, src => src.SHIPPERID)
.Map(dest => dest.ConsigneeId, src => src.CONSIGNEEID)
.Map(dest => dest.NotifyPartyId, src => src.NOTIFYPARTYID)
.Map(dest => dest.Shipper, src => src.SHIPPER)
.Map(dest => dest.Consignee, src => src.CONSIGNEE)
.Map(dest => dest.NotifyParty, src => src.NOTIFYPARTY)
.Map(dest => dest.NotifyPrt2, src => src.NOTIFYPARTY2)
.Map(dest => dest.YardId, src => src.YARDID)
.Map(dest => dest.Yard, src => src.YARD)
.Map(dest => dest.VesselId, src => src.VESSELID)
.Map(dest => dest.Vessel, src => src.VESSEL)
.Map(dest => dest.Voyno, src => src.VOYNO)
.Map(dest => dest.VoynoIn, src => src.VOYNOINNER)
.Map(dest => dest.ETD, src => src.ETD)
.Map(dest => dest.ATD, src => src.ATD)
.Map(dest => dest.ETA, src => src.ETA)
.Map(dest => dest.ClosingDate, src => src.CLOSINGDATE.HasValue ? src.CLOSINGDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseDocDate, src => src.CLOSEDOCDATE.HasValue ? src.CLOSEDOCDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseVGMDate, src => src.CLOSEVGMDATE.HasValue ? src.CLOSEVGMDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.PlaceReceiptId, src => src.PLACERECEIPTID)
.Map(dest => dest.PlaceReceipt, src => src.PLACERECEIPT)
.Map(dest => dest.PortLoadId, src => src.PORTLOAD)
.Map(dest => dest.PortLoad, src => src.PORTLOAD)
.Map(dest => dest.PortDischargeId, src => src.PORTDISCHARGEID)
.Map(dest => dest.PortDischarge, src => src.PORTDISCHARGE)
.Map(dest => dest.PlaceDeliveryId, src => src.PLACEDELIVERYID)
.Map(dest => dest.PlaceDelivery, src => src.PLACEDELIVERY)
.Map(dest => dest.DestinationId, src => src.DESTINATIONID)
.Map(dest => dest.Destination, src => src.DESTINATION)
.Map(dest => dest.NoBill, src => src.NOBILL)
.Map(dest => dest.CopyNoBill, src => src.COPYNOBILL)
.Map(dest => dest.IssueType, src => src.ISSUETYPE)
.Map(dest => dest.IssueDate, src => src.ISSUEDATE.HasValue ? src.ISSUEDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.IssuePlaceId, src => src.ISSUEPLACEID)
.Map(dest => dest.IssuePlace, src => src.ISSUEPLACE)
.Map(dest => dest.Blfrt, src => src.BLFRT)
.Map(dest => dest.PrepardAt, src => src.PREPARDAT)
.Map(dest => dest.PayableAt, src => src.PAYABLEAT)
.Map(dest => dest.Service, src => src.SERVICE)
.Map(dest => dest.Marks, src => src.MARKS)
.Map(dest => dest.HsCode, src => src.HSCODE)
.Map(dest => dest.GoodsDescription, src => src.DESCRIPTION)
.Map(dest => dest.PKGs, src => src.PKGS)
.Map(dest => dest.KindPKGs, src => src.KINDPKGS)
.Map(dest => dest.KGs, src => src.KGS)
.Map(dest => dest.CBM, src => src.CBM)
.Map(dest => dest.TotalNO, src => src.TOTALNO)
.Map(dest => dest.CntrTotal, src => src.CNTRTOTAL)
.Map(dest => dest.CarrierId, src => src.CARRIERID)
.Map(dest => dest.Carrier, src => src.CARRIER)
.Map(dest => dest.CargoId, src => src.CARGOID)
.Map(dest => dest.DClass, src => src.DCLASS)
.Map(dest => dest.DUnno, src => src.DUNNO)
.Map(dest => dest.DPage, src => src.DPAGE)
.Map(dest => dest.DLabel, src => src.DLABEL)
.Map(dest => dest.DLinkMan, src => src.LINKMAN)
.Map(dest => dest.TempId, src => src.TEMPID)
.Map(dest => dest.TempSet, src => src.TEMPSET)
.Map(dest => dest.Reeferf, src => src.REEFERF)
.Map(dest => dest.Humidity, src => src.HUMIDITY)
.Map(dest => dest.TempMin, src => src.TEMPMIN)
.Map(dest => dest.TempMax, src => src.TEMPMAX)
.Map(dest => dest.IsContaSOC, src => src.ISCONTAINERSOC)
.Map(dest => dest.SORemark, src => src.SOREMARK)
.Map(dest => dest.SIRemark, src => src.SIREMARK)
.Map(dest => dest.YardRemark, src => src.YARDREMARK)
.Map(dest => dest.ShipperName, src => src.SHIPPERNAME)
.Map(dest => dest.ShipperAddr1, src => src.SHIPPERADDR1)
.Map(dest => dest.ShipperAddr2, src => src.SHIPPERADDR2)
.Map(dest => dest.ShipperAddr3, src => src.SHIPPERADDR3)
.Map(dest => dest.ShipperCity, src => src.SHIPPERCITY)
.Map(dest => dest.ShipperProvice, src => src.SHIPPERPROVINCE)
.Map(dest => dest.ShipperPostCode, src => src.SHIPPERPOSTCODE)
.Map(dest => dest.ShipperCountry, src => src.SHIPPERCOUNTRY)
.Map(dest => dest.ShipperAttn, src => src.SHIPPERATTN)
.Map(dest => dest.ShipperTel, src => src.SHIPPERTEL)
.Map(dest => dest.ConsigneeName, src => src.CONSIGNEENAME)
.Map(dest => dest.ConsigneeAddr1, src => src.CONSIGNEEADDR1)
.Map(dest => dest.ConsigneeAddr2, src => src.CONSIGNEEADDR2)
.Map(dest => dest.ConsigneeAddr3, src => src.CONSIGNEEADDR3)
.Map(dest => dest.ConsigneeCity, src => src.CONSIGNEECITY)
.Map(dest => dest.ConsigneeProvince, src => src.CONSIGNEEPROVINCE)
.Map(dest => dest.ConsigneePostCode, src => src.CONSIGNEEPOSTCODE)
.Map(dest => dest.ConsigneeCountry, src => src.CONSIGNEERCOUNTRY)
.Map(dest => dest.ConsigneeAttn, src => src.CONSIGNEEATTN)
.Map(dest => dest.ConsigneeTel, src => src.CONSIGNEETEL)
.Map(dest => dest.NotifyPartyName, src => src.NOTIFYPARTYNAME)
.Map(dest => dest.NotifyPartyAddr1, src => src.NOTIFYPARTYADDR1)
.Map(dest => dest.NotifyPartyAddr2, src => src.NOTIFYPARTYADDR2)
.Map(dest => dest.NotifyPartyAddr3, src => src.NOTIFYPARTYADDR3)
.Map(dest => dest.NotifyPartyCity, src => src.NOTIFYPARTYCITY)
.Map(dest => dest.NotifyPartyProvince, src => src.NOTIFYPARTYPROVINCE)
.Map(dest => dest.NotifyPartyPostCode, src => src.NOTIFYPARTYPOSTCODE)
.Map(dest => dest.NotifyPartyCountry, src => src.NOTIFYPARTYCOUNTRY)
.Map(dest => dest.NotifyPartyAttn, src => src.NOTIFYPARTYATTN)
.Map(dest => dest.NotifyPartyTel, src => src.NOTIFYPARTYTEL)
.Map(dest => dest.CustomsER, src => src.CUSTOMSER)
.Map(dest => dest.TruckER, src => src.TRUCKER)
.Map(dest => dest.AgentId, src => src.AGENTID)
.Map(dest => dest.ForwarderId, src => src.FORWARDERID)
.Map(dest => dest.ShipAgencyId, src => src.SHIPAGENCYID)
.Map(dest => dest.CustomsERId, src => src.CUSTOMSERID)
.Map(dest => dest.TruckERId, src => src.TRUCKERID)
.Map(dest => dest.AgentName, src => src.AGENTNAME)
.Map(dest => dest.ConsigneeDoorAddr, src => src.CONSIGNEEDOORADDR)
.Map(dest => dest.ShipperDoorAddr, src => src.SHIPPERDOORADDR)
.Map(dest => dest.SCACCode, src => src.SCACCODE)
.Map(dest => dest.ITNCode, src => src.ITNCODE)
.Map(dest => dest.PrePardAtId, src => src.PREPARDATID)
.Map(dest => dest.PayableAtId, src => src.PAYABLEATID)
.Map(dest => dest.CustNo, src => src.CUSTNO)
.Map(dest => dest.TransportId, src => src.TRANSPORTID)
.Map(dest => dest.Transport, src => src.TRANSPORT)
.Map(dest => dest.ThirdPayAddr, src => src.THIRDPAYADDR)
.Map(dest => dest.YardContractTel, src => src.YARDCONTRACTTEL)
.Map(dest => dest.YardContractEmail, src => src.YARDCONTRACTEMAIL)
.Map(dest => dest.FeeSelf, src => src.FEESELF)
.Map(dest => dest.LaneCode, src => src.LANECODE)
.Map(dest => dest.LaneName, src => src.LANENAME)
.Map(dest => dest.FreightPayer, src => src.FREIGHTPAYER);
config.ForType<BookingCtn, TaskBookingOrderContaDto>()
.Map(dest => dest.ContaType, src => src.CTNCODE)
.Map(dest => dest.ContaTypeName, src => src.CTNALL)
.Map(dest => dest.TEU, src => src.TEU)
.Map(dest => dest.ContaNo, src => src.CNTRNO)
.Map(dest => dest.SealNo, src => src.SEALNO)
.Map(dest => dest.PKGs, src => src.PKGS)
.Map(dest => dest.KindPKGs, src => src.KINDPKGS)
.Map(dest => dest.KGs, src => src.KGS)
.Map(dest => dest.CBM, src => src.CBM)
.Map(dest => dest.TareWeight, src => src.TAREWEIGHT)
.Map(dest => dest.ContaStatus, src => src.CTNSTATUS)
.Map(dest => dest.WeighType, src => src.WEIGHTYPE)
.Map(dest => dest.WeighKGs, src => src.WEIGHKGS)
.Map(dest => dest.WeighAttn, src => src.WEIGHATTN)
.Map(dest => dest.VGMConnCom, src => src.VGMCONNCOM)
.Map(dest => dest.WeighTel, src => src.WEIGHTEL)
.Map(dest => dest.WeighDate, src => src.WEIGHDATE)
.Map(dest => dest.VGMAddr, src => src.VGMADDR)
.Map(dest => dest.VGMEmail, src => src.VGMEMAIL)
.Map(dest => dest.Remark, src => src.REMARK);
config.ForType<BookingCtnDetail, TaskBookingOrderCargoDto>()
.Map(dest => dest.PKGs, src => src.PKGS)
.Map(dest => dest.KindPKGs, src => src.KINDPKGS)
.Map(dest => dest.KGs, src => src.KGS)
.Map(dest => dest.CBM, src => src.CBM)
.Map(dest => dest.HSCode, src => src.HSCODE)
.Map(dest => dest.Marks, src => src.MARKS)
.Map(dest => dest.Description, src => src.DESCRIPTION)
.Map(dest => dest.Remark, src => src.REMARK);
} }
} }
} }

2
Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs
Unescape Escape View File

@ -147,7 +147,7 @@ namespace Myshipping.Application
/// </summary> /// </summary>
/// <param name="taskPKId">任务主键</param> /// <param name="taskPKId">任务主键</param>
/// <returns>返回结果</returns> /// <returns>返回结果</returns>
Task<TaskManageOrderResultDto> GetBookingOrderInfo(string taskPKId); Task<TaskBookingOrderDto> GetBookingOrderInfo(string taskPKId);
} }

270
Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
Unescape Escape View File

@ -12,15 +12,18 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Myshipping.Application.EDI;
using Myshipping.Application.Entity; using Myshipping.Application.Entity;
using Myshipping.Application.Helper; using Myshipping.Application.Helper;
using Myshipping.Core; using Myshipping.Core;
using Myshipping.Core.Entity; using Myshipping.Core.Entity;
using Myshipping.Core.Service; using Myshipping.Core.Service;
using MySqlX.XDevAPI.Common; using MySqlX.XDevAPI.Common;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NPOI.HPSF; using NPOI.HPSF;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using NPOI.XSSF.Model;
using Org.BouncyCastle.Asn1.X500; using Org.BouncyCastle.Asn1.X500;
using SixLabors.ImageSharp.Processing.Processors.Transforms; using SixLabors.ImageSharp.Processing.Processors.Transforms;
using SqlSugar; using SqlSugar;
@ -62,11 +65,15 @@ namespace Myshipping.Application
private readonly SqlSugarRepository<TaskLARAPaperInfo> _taskLARAPaperInfoRepository; private readonly SqlSugarRepository<TaskLARAPaperInfo> _taskLARAPaperInfoRepository;
private readonly SqlSugarRepository<BookingOrder> _bookingOrderRepository; private readonly SqlSugarRepository<BookingOrder> _bookingOrderRepository;
private readonly SqlSugarRepository<BookingCtn> _bookingOrderContaRepository;
private readonly SqlSugarRepository<BookingCtnDetail> _bookingOrderContaCargoRepository;
private readonly SqlSugarRepository<BookingStatus> _bookingStatusRepository;
private readonly IDjyWebsiteAccountConfigService _webAccountConfig; private readonly IDjyWebsiteAccountConfigService _webAccountConfig;
private readonly ISysCacheService _cache; private readonly ISysCacheService _cache;
private readonly ILogger<BookingOrderService> _logger; private readonly ILogger<BookingOrderService> _logger;
const string CONST_WEB_ACCOUNT_TYPE = "CmaWeb"; const string CONST_WEB_ACCOUNT_TYPE = "CmaWeb";
const string CONST_BOOK_ORIGINAL_DOWN_URL_CODE = "bookOriginalDownUrl"; const string CONST_BOOK_ORIGINAL_DOWN_URL_CODE = "bookOriginalDownUrl";
@ -86,6 +93,9 @@ namespace Myshipping.Application
SqlSugarRepository<TaskChargesHisInfo> taskChargesHisInfoRepository, SqlSugarRepository<TaskChargesHisInfo> taskChargesHisInfoRepository,
SqlSugarRepository<BookingOrder> bookingOrderRepository, SqlSugarRepository<BookingOrder> bookingOrderRepository,
SqlSugarRepository<TaskLARAPaperInfo> taskLARAPaperInfoRepository, SqlSugarRepository<TaskLARAPaperInfo> taskLARAPaperInfoRepository,
SqlSugarRepository<BookingCtn> bookingOrderContaRepository,
SqlSugarRepository<BookingCtnDetail> bookingOrderContaCargoRepository,
SqlSugarRepository<BookingStatus> bookingStatusRepository,
IDjyWebsiteAccountConfigService webAccountConfig, IDjyWebsiteAccountConfigService webAccountConfig,
ISysCacheService cache, ISysCacheService cache,
ILogger<BookingOrderService> logger) ILogger<BookingOrderService> logger)
@ -103,6 +113,9 @@ namespace Myshipping.Application
_taskChargesHisInfoRepository = taskChargesHisInfoRepository; _taskChargesHisInfoRepository = taskChargesHisInfoRepository;
_bookingOrderRepository = bookingOrderRepository; _bookingOrderRepository = bookingOrderRepository;
_taskLARAPaperInfoRepository = taskLARAPaperInfoRepository; _taskLARAPaperInfoRepository = taskLARAPaperInfoRepository;
_bookingOrderContaRepository = bookingOrderContaRepository;
_bookingOrderContaCargoRepository = bookingOrderContaCargoRepository;
_bookingStatusRepository = bookingStatusRepository;
_webAccountConfig = webAccountConfig; _webAccountConfig = webAccountConfig;
_cache = cache; _cache = cache;
@ -1774,19 +1787,270 @@ namespace Myshipping.Application
{ {
TaskManageOrderResultDto result = new TaskManageOrderResultDto(); TaskManageOrderResultDto result = new TaskManageOrderResultDto();
string batchNo = IDGen.NextID().ToString();
/*
1、查询任务关联的订舱信息。
2、触发下货纸发送。
3、发送成功更新任务状态为成功。
4、查看用户公司是否配置了反馈地址，如果有配置则触发反馈推送，否则显示反馈失败提示。
5、触发扣费
*/
try
{
var taskInfo = _taskBaseInfoRepository.AsQueryable().First(t => t.PK_ID == taskPKId);
if (taskInfo == null)
Oops.Oh($"任务信息获取失败");
if(taskInfo.TASK_TYPE != TaskBusiTypeEnum.SHIPPING_ORDER.ToString())
Oops.Oh($"当前任务类型不是{TaskBusiTypeEnum.SHIPPING_ORDER.GetDescription()}，不能发送下货纸");
if (string.IsNullOrWhiteSpace(taskInfo.BOOK_ORDER_NO))
Oops.Oh($"任务信息的订舱主键不存在");
var orderInfo = _bookingOrderRepository.AsQueryable()
.First(t => t.Id == long.Parse(taskInfo.BOOK_ORDER_NO));
if (orderInfo == null)
Oops.Oh($"订舱信息获取失败");
//推送下货纸业务
var rtn = await XiahuozhiHelpler.Send(orderInfo.Id, fileRole);
if (!rtn.Key)
{
throw Oops.Bah($"发送失败：{rtn.Value}");
}
//订舱状态写入
await SaveBookingStatus(orderInfo.Id, "sta_xhz", "下货纸");
taskInfo.STATUS = TaskStatusEnum.Complete.ToString();
taskInfo.STATUS_NAME = TaskStatusEnum.Complete.GetDescription();
taskInfo.COMPLETE_DATE = DateTime.Now;
taskInfo.COMPLETE_DEAL = TaskCompleteDealEnum.MANUAL.ToString();
taskInfo.COMPLETE_DEAL_NAME = TaskCompleteDealEnum.MANUAL.GetDescription();
taskInfo.UpdatedTime = DateTime.Now;
taskInfo.UpdatedUserId = UserManager.UserId;
taskInfo.UpdatedUserName = UserManager.Name;
//更新任务表
await _taskBaseInfoRepository.AsUpdateable(taskInfo).UpdateColumns(it => new
{
it.STATUS,
it.STATUS_NAME,
it.COMPLETE_DATE,
it.COMPLETE_DEAL,
it.COMPLETE_DEAL_NAME,
it.UpdatedTime,
it.UpdatedUserId,
it.UpdatedUserName
}).ExecuteCommandAsync();
await InnerChargeFeeShippingOrder(taskInfo);
//反馈用户（这里预留，主要考虑是否通过用户配置确定是否需要推送回执）
await FeedbackXiaHuoZhi("");
}
catch(Exception ex)
{
throw Oops.Bah($"获取发送下货纸异常,{0}", ex.Message);
}
return result;
}
#region 更新订舱的状态
/// <summary>
/// 更新订舱的状态
/// </summary>
/// <param name="bookingId">订舱主键</param>
/// <param name="code">状态代码</param>
/// <param name="name">状态名称</param>
/// <returns></returns>
private async Task SaveBookingStatus(long bookingId, string code, string name)
{
var bookSta = _bookingStatusRepository.FirstOrDefault(x => x.BookingId == bookingId && x.StaCode == code);
if (bookSta == null)
{
//记录状态
bookSta = new BookingStatus();
bookSta.BookingId = bookingId;
bookSta.StaCode = code;
bookSta.StaName = name;
bookSta.StaTime = DateTime.Now;
await _bookingStatusRepository.InsertAsync(bookSta);
}
else
{
bookSta.StaTime = DateTime.Now;
await _bookingStatusRepository.UpdateAsync(bookSta);
}
}
#endregion
#region 扣费
/// <summary>
/// 扣费
/// </summary>
/// <param name="taskBaseInfo">任务信息</param>
/// <param name="isCharge">是否执行扣费 true-执行扣费 false-不执行扣费（主要是符合扣费条件但是由于超时没有得到准确回执）</param>
/// <returns>返回回执</returns>
private async Task<TaskManageOrderResultDto> InnerChargeFeeShippingOrder(TaskBaseInfo taskBaseInfo, bool isCharge = true)
{
TaskManageOrderResultDto result = new TaskManageOrderResultDto { succ = false };
try
{
decimal balance = 0;
decimal price = 0;
decimal total = 0;
TaskChargesHisInfo model = new TaskChargesHisInfo
{
PK_ID = IDGen.NextID().ToString(),
TASK_ID = taskBaseInfo.PK_ID,
BEFORE_BALANCE = balance,
PRICE = price,
BUSI_TYPE = "21",
BUSI_TYPE_NAME = String.Empty,
SEND_TYPE = "1001",
SEND_TYPE_NAME = String.Empty,
REMARK = "下货纸",
QTY = 1,
TOTAL_AMOUNT = total,
};
if (!isCharge)
{
model.STATUS = TaskChargeStatusEnum.UNKNOW_RESULT.ToString();
model.STATUS_NAME = TaskChargeStatusEnum.UNKNOW_RESULT.GetDescription();
}
//写入记录
await _taskChargesHisInfoRepository.InsertAsync(model);
result.succ = false;
result.msg = "扣费失败";
}
catch (Exception ex)
{
result.succ = false;
result.msg = ex.Message;
}
return result; return result;
} }
#endregion
/// <summary> /// <summary>
/// 获取订舱详情 /// 获取订舱详情
/// </summary> /// </summary>
/// <param name="taskPKId">任务主键</param> /// <param name="taskPKId">任务主键</param>
/// <returns>返回结果</returns> /// <returns>返回结果</returns>
public async Task<TaskManageOrderResultDto> GetBookingOrderInfo(string taskPKId) [HttpGet("/TaskManage/GetBookingOrderInfo")]
public async Task<TaskBookingOrderDto> GetBookingOrderInfo([FromQuery]string taskPKId)
{ {
TaskManageOrderResultDto result = new TaskManageOrderResultDto(); TaskBookingOrderDto model = new TaskBookingOrderDto();
return result; string batchNo = IDGen.NextID().ToString();
try
{
var taskInfo = _taskBaseInfoRepository.AsQueryable().First(t => t.PK_ID == taskPKId);
if (taskInfo == null)
Oops.Oh($"任务信息获取失败");
if (string.IsNullOrWhiteSpace(taskInfo.BOOK_ORDER_NO))
Oops.Oh($"任务信息的订舱主键不存在");
var orderInfo = _bookingOrderRepository.AsQueryable()
.First(t => t.Id == long.Parse(taskInfo.BOOK_ORDER_NO));
if(orderInfo != null)
{
//订舱
model = orderInfo.Adapt<TaskBookingOrderDto>();
var contaList = await _bookingOrderContaRepository.AsQueryable().Where(x => x.BILLID == orderInfo.Id).ToListAsync();
//获取集装箱的主键
var ctnArg = contaList.Select(t => t.Id).ToArray();
//查询集装箱所有的货物信息
var cargoList = await _bookingOrderContaCargoRepository.AsQueryable()
.Where(x => ctnArg.Contains(x.CTNID.Value)).ToListAsync();
_logger.LogInformation("批次={no} 提取货物明细完成 数量={total}", batchNo, cargoList.Count);
if (cargoList.Count > 0)
{
model.ContaList = contaList.GroupJoin(cargoList, l => l.Id, r => r.CTNID, (l, r) => {
var currList = r.ToList();
if (currList.Count > 0)
{
var info = l.Adapt<TaskBookingOrderContaDto>();
info.CargoList = currList.Adapt<List<TaskBookingOrderCargoDto>>();
return info;
}
return l.Adapt<TaskBookingOrderContaDto>();
}).ToList();
}
else
{
model.ContaList = contaList.Adapt<List<TaskBookingOrderContaDto>>();
}
//任务
model.TaskBaseInfo = taskInfo.Adapt<TaskBaseInfoDto>();
}
}
catch (Exception ex)
{
throw Oops.Bah($"获取订舱详情异常,{0}", ex.Message);
}
return model;
}
private async Task FeedbackXiaHuoZhi(string bsno)
{
/*
var para = commonData.ParamValues.AsNoTracking().FirstOrDefault(x => x.CompId == compid && x.ParaCode == "XHZ_FEEDBACK_URL");
if (para == null || string.IsNullOrEmpty(para.ItemCode))
{
msg = "下货纸反馈地址未配置";
return false;
}
var feedbask = new BackgroundTaskCommon();
feedbask.GID = Guid.NewGuid().ToString();
feedbask.Status = BackgroundTaskCommon.StatusCreate;
feedbask.Type = BackgroundTaskCommon.TypeHttpFeedback;
feedbask.CreateTime = DateTime.Now;
feedbask.ParamData = JsonConvert.SerializeObject(new
{
url = para.ItemCode,
method = "POST",
json = JsonConvert.SerializeObject(new
{
bsno,
status
})
});
commonData.BackgroundTaskCommon.Add(feedbask);
msg = "成功";
return true;
*/
} }
} }

Write Preview
Loading…
Cancel
Save