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
booking_auth_dev
wanghaomei 2 years ago
parent 7df5128c35 2d17d6289a
commit 320e58e34b
6 changed files with 449 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -5467,6 +5467,156 @@
租户ID 租户ID
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.PKGs">
<summary>
件数
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.KindPKGs">
<summary>
包装
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.KGs">
<summary>
毛重
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.CBM">
<summary>
尺码
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.HSCode">
<summary>
HS编码
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.Marks">
<summary>
唛头
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.Description">
<summary>
货描
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaCargoInfo.Remark">
<summary>
备注
</summary>
</member>
<member name="T:Myshipping.Application.RulesEngineOrderBookingContaInfo">
<summary>
集装箱信息
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.ContaType">
<summary>
箱型代码
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.ContaTypeName">
<summary>
箱型
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.TEU">
<summary>
TEU
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.ContaNo">
<summary>
箱号
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.SealNo">
<summary>
封号
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.PKGs">
<summary>
件数
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.KindPKGs">
<summary>
包装
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.KGs">
<summary>
毛重
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.CBM">
<summary>
尺码
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.TareWeight">
<summary>
皮重
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.ContaStatus">
<summary>
箱状态
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.WeighType">
<summary>
称重方式
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.WeighKGs">
<summary>
称重重量
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.WeighAttn">
<summary>
称重联系人
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.VGMConnCom">
<summary>
VGM联系公司
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.WeighTel">
<summary>
VGM联系电话
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.WeighDate">
<summary>
称重日期
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.VGMAddr">
<summary>
VGM地址
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.VGMEmail">
<summary>
VGM邮箱
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingContaInfo.CargoList">
<summary>
货物明细
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingMainInfo.ProjectCode"> <member name="P:Myshipping.Application.RulesEngineOrderBookingMainInfo.ProjectCode">
<summary> <summary>
项目代码（可以填多个，主要是标识要进行的规则过滤） 项目代码（可以填多个，主要是标识要进行的规则过滤）
@ -6234,6 +6384,11 @@
是否拼箱 是否拼箱
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Application.RulesEngineOrderBookingMainBusinessInfo.ContaList">
<summary>
箱信息
</summary>
</member>
<member name="T:Myshipping.Application.RulesEngineOrderBookingMessageInfo"> <member name="T:Myshipping.Application.RulesEngineOrderBookingMessageInfo">
<summary> <summary>
海运订舱规则请求报文 海运订舱规则请求报文
@ -6435,7 +6590,7 @@
请求规则平台 请求规则平台
</summary> </summary>
</member> </member>
<member name="M:Myshipping.Application.RulesEngineClientService.#ctor(Myshipping.Core.SqlSugarRepository{Myshipping.Application.Entity.BookingOrder})"> <member name="M:Myshipping.Application.RulesEngineClientService.#ctor(Myshipping.Core.SqlSugarRepository{Myshipping.Application.Entity.BookingOrder},Myshipping.Core.SqlSugarRepository{Myshipping.Application.Entity.BookingCtn},Myshipping.Core.SqlSugarRepository{Myshipping.Application.Entity.BookingCtnDetail})">
<summary> <summary>
</summary> </summary>

65
Myshipping.Application/Service/RulesEngine/Dtos/OceanBookingMapper.cs
Unescape Escape View File

@ -276,6 +276,71 @@ namespace Myshipping.Application
.Map(dest => dest.LaneName, src => src.LANENAME) .Map(dest => dest.LaneName, src => src.LANENAME)
.Map(dest => dest.FreightPayer, src => src.FREIGHTPAYER); .Map(dest => dest.FreightPayer, src => src.FREIGHTPAYER);
config.ForType<BookingCtn, RulesEngineOrderBookingContaInfo>()
.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<BookingCtnDto, RulesEngineOrderBookingContaInfo>()
.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, RulesEngineOrderBookingContaCargoInfo>()
.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);
config.ForType<BookingCtnDetailDto, RulesEngineOrderBookingContaCargoInfo>()
.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);
} }
} }
} }

44
Myshipping.Application/Service/RulesEngine/Dtos/OrderBooking/RulesEngineOrderBookingContaCargoInfo.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 RulesEngineOrderBookingContaCargoInfo
{
/// <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; }
}
}

100
Myshipping.Application/Service/RulesEngine/Dtos/OrderBooking/RulesEngineOrderBookingContaInfo.cs
Unescape Escape View File

@ -0,0 +1,100 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application
{
/// <summary>
/// 集装箱信息
/// </summary>
public class RulesEngineOrderBookingContaInfo
{
/// <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>
/// 货物明细
/// </summary>
public List<RulesEngineOrderBookingContaCargoInfo> CargoList { get; set; }
}
}

5
Myshipping.Application/Service/RulesEngine/Dtos/OrderBooking/RulesEngineOrderBookingMainInfo.cs
Unescape Escape View File

@ -641,5 +641,10 @@ namespace Myshipping.Application
/// 是否拼箱 /// 是否拼箱
/// </summary> /// </summary>
public Nullable<bool> IsContaLCL { get; set; } public Nullable<bool> IsContaLCL { get; set; }
/// <summary>
/// 箱信息
/// </summary>
public List<RulesEngineOrderBookingContaInfo> ContaList { get; set; }
} }
} }

79
Myshipping.Application/Service/RulesEngine/RulesEngineClientService.cs
Unescape Escape View File

@ -26,12 +26,19 @@ namespace Myshipping.Application
public class RulesEngineClientService: IRulesEngineClientService, IDynamicApiController, ITransient public class RulesEngineClientService: IRulesEngineClientService, IDynamicApiController, ITransient
{ {
private readonly SqlSugarRepository<BookingOrder> _bookingOrderRepository; private readonly SqlSugarRepository<BookingOrder> _bookingOrderRepository;
private readonly SqlSugarRepository<BookingCtn> _bookingOrderContaRepository;
private readonly SqlSugarRepository<BookingCtnDetail> _bookingOrderContaCargoRepository;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public RulesEngineClientService(SqlSugarRepository<BookingOrder> bookingOrderRepository) public RulesEngineClientService(SqlSugarRepository<BookingOrder> bookingOrderRepository,
SqlSugarRepository<BookingCtn> bookingOrderContaRepository,
SqlSugarRepository<BookingCtnDetail> bookingOrderContaCargoRepository)
{ {
_bookingOrderRepository = bookingOrderRepository; _bookingOrderRepository = bookingOrderRepository;
_bookingOrderContaRepository = bookingOrderContaRepository;
_bookingOrderContaCargoRepository = bookingOrderContaCargoRepository;
} }
@ -40,6 +47,8 @@ namespace Myshipping.Application
/// </summary> /// </summary>
/// <param name="model">海运订舱请求业务</param> /// <param name="model">海运订舱请求业务</param>
/// <returns>返回用户信息</returns> /// <returns>返回用户信息</returns>
[ApiDescriptionSettings(LowercaseRoute = false, SplitCamelCase = false)]
[HttpPost]
public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByMsg(RulesEngineOrderBookingMessageInfo model) public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByMsg(RulesEngineOrderBookingMessageInfo model)
{ {
RulesEngineExcuteResultDto result = new RulesEngineExcuteResultDto(); RulesEngineExcuteResultDto result = new RulesEngineExcuteResultDto();
@ -68,6 +77,7 @@ namespace Myshipping.Application
/// </summary> /// </summary>
/// <param name="bookingId">海运订舱主键</param> /// <param name="bookingId">海运订舱主键</param>
/// <returns>返回用户信息</returns> /// <returns>返回用户信息</returns>
[ApiDescriptionSettings(LowercaseRoute = false, SplitCamelCase = false)]
[HttpGet] [HttpGet]
public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBooking(string bookingId) public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBooking(string bookingId)
{ {
@ -113,6 +123,39 @@ namespace Myshipping.Application
msgModel.Main.BusinessInfo = model.Adapt<RulesEngineOrderBookingMainBusinessInfo>(); msgModel.Main.BusinessInfo = model.Adapt<RulesEngineOrderBookingMainBusinessInfo>();
var contaList = await _bookingOrderContaRepository.AsQueryable().Where(x => x.BILLID == model.Id).ToListAsync();
if (contaList.Count > 0)
{
msgModel.Main.BusinessInfo.ContaList = contaList.Adapt<List<RulesEngineOrderBookingContaInfo>>();
var cargoList = await _bookingOrderContaCargoRepository.AsQueryable()
.Where(x=> contaList.Any(a=>a.Id == x.CTNID)).ToListAsync();
if(cargoList.Count > 0)
{
msgModel.Main.BusinessInfo.ContaList = contaList.GroupJoin(cargoList, l => l.Id, r => r.CTNID, (l, r) => {
var currList = r.ToList();
if (currList.Count > 0)
{
var info = l.Adapt<RulesEngineOrderBookingContaInfo>();
info.CargoList = currList.Adapt<List<RulesEngineOrderBookingContaCargoInfo>>();
return info;
}
return l.Adapt<RulesEngineOrderBookingContaInfo>();
}).ToList();
}
else
{
msgModel.Main.BusinessInfo.ContaList = contaList.Adapt<List<RulesEngineOrderBookingContaInfo>>();
}
}
var ruleResult = await ExcuteRulesEngine(msgModel); var ruleResult = await ExcuteRulesEngine(msgModel);
if(ruleResult == null) if(ruleResult == null)
@ -143,6 +186,7 @@ namespace Myshipping.Application
/// </summary> /// </summary>
/// <param name="model">海运订舱报文类</param> /// <param name="model">海运订舱报文类</param>
/// <returns>返回回执</returns> /// <returns>返回回执</returns>
[ApiDescriptionSettings(LowercaseRoute = false, SplitCamelCase = false)]
[HttpPost] [HttpPost]
public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByModel(BookingOrderDto model) public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByModel(BookingOrderDto model)
{ {
@ -192,6 +236,39 @@ namespace Myshipping.Application
msgModel.Main.BusinessInfo = model.Adapt<RulesEngineOrderBookingMainBusinessInfo>(); msgModel.Main.BusinessInfo = model.Adapt<RulesEngineOrderBookingMainBusinessInfo>();
var contaList = await _bookingOrderContaRepository.AsQueryable().Where(x => x.BILLID == model.Id).ToListAsync();
if (contaList.Count > 0)
{
msgModel.Main.BusinessInfo.ContaList = contaList.Adapt<List<RulesEngineOrderBookingContaInfo>>();
var cargoList = await _bookingOrderContaCargoRepository.AsQueryable()
.Where(x => contaList.Any(a => a.Id == x.CTNID)).ToListAsync();
if (cargoList.Count > 0)
{
msgModel.Main.BusinessInfo.ContaList = contaList.GroupJoin(cargoList, l => l.Id, r => r.CTNID, (l, r) =>
{
var currList = r.ToList();
if (currList.Count > 0)
{
var info = l.Adapt<RulesEngineOrderBookingContaInfo>();
info.CargoList = currList.Adapt<List<RulesEngineOrderBookingContaCargoInfo>>();
return info;
}
return l.Adapt<RulesEngineOrderBookingContaInfo>();
}).ToList();
}
else
{
msgModel.Main.BusinessInfo.ContaList = contaList.Adapt<List<RulesEngineOrderBookingContaInfo>>();
}
}
var ruleResult = await ExcuteRulesEngine(msgModel); var ruleResult = await ExcuteRulesEngine(msgModel);
if (ruleResult == null) if (ruleResult == null)

Write Preview
Loading…
Cancel
Save