From 5435d32abb096f5d830727950acb4056c0b9e857 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Tue, 2 Apr 2024 10:21:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=88=B1=E5=8D=95=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E8=A7=A3=E5=86=B3=E6=B2=A1=E5=88=86?= =?UTF-8?q?=E5=8D=95=E6=83=85=E5=86=B5=E4=B8=8B=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingOrderSeaeEdiService.cs | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs index 4bf0bc9b..33793b25 100644 --- a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs +++ b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs @@ -422,18 +422,22 @@ namespace Myshipping.Application checkResult.Add($"舱单主单中箱子的【总尺码】与订舱中箱子的【总尺码】不一致"); } - if (分单箱子列表.Sum(x => x.PKGS) != bkOrderCtnList.Sum(x => x.PKGS)) + if (分单箱子列表.Count > 0) { - checkResult.Add($"舱单分单中箱子的【总件数】与订舱中箱子的【总件数】不一致"); - } - if (分单箱子列表.Sum(x => x.KGS) != bkOrderCtnList.Sum(x => x.KGS)) - { - checkResult.Add($"舱单分单中箱子的【总重量】与订舱中箱子的【总重量】不一致"); - } - if (分单箱子列表.Sum(x => x.CBM) != bkOrderCtnList.Sum(x => x.CBM)) - { - checkResult.Add($"舱单分单中箱子的【总尺码】与订舱中箱子的【总尺码】不一致"); + if (分单箱子列表.Sum(x => x.PKGS) != bkOrderCtnList.Sum(x => x.PKGS)) + { + checkResult.Add($"舱单分单中箱子的【总件数】与订舱中箱子的【总件数】不一致"); + } + if (分单箱子列表.Sum(x => x.KGS) != bkOrderCtnList.Sum(x => x.KGS)) + { + checkResult.Add($"舱单分单中箱子的【总重量】与订舱中箱子的【总重量】不一致"); + } + if (分单箱子列表.Sum(x => x.CBM) != bkOrderCtnList.Sum(x => x.CBM)) + { + checkResult.Add($"舱单分单中箱子的【总尺码】与订舱中箱子的【总尺码】不一致"); + } } + // 再按箱号比较 foreach (var item in 主单箱子列表.GroupBy(x => x.CNTRNO)) From 5a1a84687a967d37e3ea309bbf0d2f2b08ea0e26 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 2 Apr 2024 16:24:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/BookingCustomerOrder.cs | 25 +++++ .../BookingCustomerOrderService.cs | 96 ++++++++++++++++--- .../Service/BookingCustomerOrder/Dto/Dtos.cs | 25 +++++ 3 files changed, 133 insertions(+), 13 deletions(-) diff --git a/Myshipping.Application/Entity/BookingCustomerOrder.cs b/Myshipping.Application/Entity/BookingCustomerOrder.cs index a4d1312b..a3a4ce1a 100644 --- a/Myshipping.Application/Entity/BookingCustomerOrder.cs +++ b/Myshipping.Application/Entity/BookingCustomerOrder.cs @@ -288,6 +288,31 @@ namespace Myshipping.Application.Entity /// 附加数据 /// public string ExtendData { get; set; } + + /// + /// 起运港唯一代码 + /// + public string PORTLOADCODE { get; set; } + + /// + /// 目的港唯一代码 + /// + public string PORTDISCHARGECODE { get; set; } + + /// + /// 目的地唯一代码 + /// + public string DESTINATIONCODE { get; set; } + + /// + /// 付费方式代码 + /// + public string FRTCODE { get; set; } + + /// + /// 运输条款代码 + /// + public string SERVICECODE { get; set; } } /// diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index 447886d6..c64fb54a 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -1763,7 +1763,12 @@ namespace Myshipping.Application [HttpPost("/BookingCustomerOrder/ReceiveCustomerOrder"), AllowAnonymous, ApiUser] public async Task ReceiveCustomerOrder([FromForm] BookingCustomerApiSaveInput input, IFormFile[] files) { - + var carrList = await _cache.GetAllCodeCarrier(); + var portLoadList = await _cache.GetAllCodePortLoad(); + var portDestList = await _cache.GetAllCodePort(); + var serviceList = await _cache.GetAllCodeService(); + var frtList = await _cache.GetAllCodeFrt(); + var ctnList = await _cache.GetAllCodeCtn(); #region 校验 /* 1.必填字段：船公司，开船日期，起运港，目的港，箱型箱量，服务项目，运输条款，付费方式，件数，毛重，包装，货物标识，品名，HSCODE。 @@ -1792,34 +1797,77 @@ namespace Myshipping.Application // throw Oops.Bah("订舱密码不能为空"); //} - if (string.IsNullOrEmpty(input.CARRIERID) || string.IsNullOrEmpty(input.CARRIER)) + //2024-4-2，为保证后面自动化订舱需要，船司、港口、箱型等信息改为传公共库中的唯一代码 + if (string.IsNullOrEmpty(input.CARRIERID)) + { + throw Oops.Bah("船司代码不能为空"); + } + + var carr = carrList.FirstOrDefault(x => x.Code == input.CARRIERID); + if (carr == null) { - throw Oops.Bah("船司代码和名称不能为空"); + throw Oops.Bah($"未找到匹配的船司代码：{input.CARRIERID}"); } + if (!input.ETD.HasValue) { throw Oops.Bah("开船日期不能为空"); } - if (string.IsNullOrEmpty(input.PORTLOADID) || string.IsNullOrEmpty(input.PORTLOAD)) + //2024-4-2，为保证后面自动化订舱需要，船司、港口、箱型等信息改为传公共库中的唯一代码，名称和五字码根据唯一代码匹配写入，无需传递 + //if (string.IsNullOrEmpty(input.PORTLOADID) || string.IsNullOrEmpty(input.PORTLOAD)) + //{ + // throw Oops.Bah("起运港代码和名称不能为空"); + //} + + //if (string.IsNullOrEmpty(input.PORTDISCHARGEID) || string.IsNullOrEmpty(input.PORTDISCHARGE)) + //{ + // throw Oops.Bah("目的港代码和名称不能为空"); + //} + + if (string.IsNullOrEmpty(input.PORTLOADCODE)) + { + throw Oops.Bah("起运港代码不能为空"); + } + + var portLoad = portLoadList.FirstOrDefault(x => x.Code == input.PORTLOADCODE); + if (portLoad == null) + { + throw Oops.Bah($"未找到匹配的起运港：{input.PORTLOADCODE}"); + } + + if (string.IsNullOrEmpty(input.PORTDISCHARGECODE)) + { + throw Oops.Bah("目的港代码不能为空"); + } + + var portDest = portDestList.FirstOrDefault(x => x.Code == input.PORTDISCHARGECODE); + if (portDest == null) { - throw Oops.Bah("起运港代码和名称不能为空"); + throw Oops.Bah($"未找到匹配的目的港：{input.PORTDISCHARGECODE}"); } - if (string.IsNullOrEmpty(input.PORTDISCHARGEID) || string.IsNullOrEmpty(input.PORTDISCHARGE)) + if (string.IsNullOrEmpty(input.SERVICECODE)) { - throw Oops.Bah("目的港代码和名称不能为空"); + throw Oops.Bah("运输条款代码不能为空"); } - if (string.IsNullOrEmpty(input.SERVICE)) + var service = serviceList.FirstOrDefault(x => x.Code == input.SERVICECODE); + if (service == null) { - throw Oops.Bah("运输条款不能为空"); + throw Oops.Bah($"未找到匹配的运输条款：{input.SERVICECODE}"); } - if (string.IsNullOrEmpty(input.BLFRT)) + if (string.IsNullOrEmpty(input.FRTCODE)) { - throw Oops.Bah("付费方式不能为空"); + throw Oops.Bah("付费方式代码不能为空"); + } + + var frt = frtList.FirstOrDefault(x => x.Code == input.FRTCODE); + if (frt == null) + { + throw Oops.Bah($"未找到匹配的付费方式：{input.FRTCODE}"); } if (!input.KGS.HasValue) @@ -1848,6 +1896,7 @@ namespace Myshipping.Application throw Oops.Bah("货物标识为冻柜的情况下，湿度不能为空"); } } + else if (input.CARGOID == "D") { if (string.IsNullOrEmpty(input.DUNNO)) @@ -1875,13 +1924,20 @@ namespace Myshipping.Application if (input.CtnList == null || input.CtnList.Count == 0) { - throw Oops.Bah("箱型箱量不能为空"); + throw Oops.Bah("箱信息不能为空"); + } + + var notExistCode = input.CtnList.Where(x => ctnList.Count(y => y.Code == x.CTNCODE) == 0).Select(x => x.CTNCODE).ToList(); + if (notExistCode.Any()) + { + throw Oops.Bah($"未找到箱型：{string.Join(",", notExistCode)}"); } if (input.ServiceItemList == null || input.ServiceItemList.Count == 0) { throw Oops.Bah("服务项目不能为空"); } + #endregion var custOrder = await _rep.AsQueryable().Filter(null, true).FirstAsync(x => x.TenantId == UserManager.TENANT_ID && x.BSNO == input.BSNO); @@ -1909,6 +1965,16 @@ namespace Myshipping.Application ins = true; } + //赋值根据唯一代码匹配后的代码、名称等信息 + custOrder.CARRIER = carr.EnName; + custOrder.PORTLOAD = portLoad.EnName; + custOrder.PORTLOADID = portLoad.EdiCode; + custOrder.PORTDISCHARGE = portDest.EnName; + custOrder.PORTDISCHARGEID = portDest.EdiCode; + custOrder.SERVICE = service.Name; + custOrder.BLFRT = frt.EnName; + + //订舱账号、密码 var jobj = new JObject(); if (!string.IsNullOrEmpty(custOrder.ExtendData)) @@ -1916,13 +1982,17 @@ namespace Myshipping.Application jobj = JObject.Parse(custOrder.ExtendData); } - var jobjBookAcc=new JObject(); + var jobjBookAcc = new JObject(); jobjBookAcc["Account"] = input.BOOKINGACCOUNT; jobjBookAcc["Password"] = input.BOOKINGPASSWORD; jobj["BookingAccount"] = jobjBookAcc; custOrder.ExtendData = jobjBookAcc.ToJsonString(); var ctns = input.CtnList.Adapt>(); + foreach(var ctn in ctns) + { + ctn.CTNALL = ctnList.First(x => x.Code == ctn.CTNCODE).Name; + } var servList = input.ServiceItemList.Adapt>(); await SaveData(custOrder, ctns, servList, ins); diff --git a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs index 0bf18f31..b4b61873 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs @@ -300,6 +300,31 @@ namespace Myshipping.Application /// 目的地 /// public string DESTINATION { get; set; } + + /// + /// 起运港唯一代码 + /// + public string PORTLOADCODE { get; set; } + + /// + /// 目的港唯一代码 + /// + public string PORTDISCHARGECODE { get; set; } + + /// + /// 目的地唯一代码 + /// + public string DESTINATIONCODE { get; set; } + + /// + /// 付费方式代码 + /// + public string FRTCODE { get; set; } + + /// + /// 运输条款代码 + /// + public string SERVICECODE { get; set; } } //保存dto From 3fad45578a676d11286f7bc427e6fd1cfd93bd00 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Tue, 2 Apr 2024 17:17:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8E=A5=E6=94=B6BC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E8=88=B1Dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/Dto/ReceiveBcInfoDto.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Myshipping.Application/Service/BookingOrder/Dto/ReceiveBcInfoDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/ReceiveBcInfoDto.cs index 2ffaf93c..9ebeeaff 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/ReceiveBcInfoDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/ReceiveBcInfoDto.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace Myshipping.Application.Service.BookingOrder.Dto { @@ -11,5 +12,14 @@ namespace Myshipping.Application.Service.BookingOrder.Dto public string VESSEL { get; set; } public string VOYNO { get; set; } public DateTime? ETD { get; set; } + + public List Files { get; set; } + + public class DownloadFile + { + public string FileName { get; set; } + public string FileType { get; set; } + public string FilePath { get; set; } + } } } From 573b91339c60f8ff7262c1bae2e8a6dd29769eb9 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Wed, 3 Apr 2024 09:03:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/ConfigOption/Mapper.cs | 5 ++++ Myshipping.Application/Entity/BookingOrder.cs | 25 ++++++++++++++++++ .../BookingOrder/Dto/BookingOrderDto.cs | 26 +++++++++++++++++++ .../BookingOrder/Dto/SyncCustomerDto.cs | 25 ++++++++++++++++++ .../Dto/BookingSoTemplateOutput.cs | 20 ++++++++++++++ 5 files changed, 101 insertions(+) diff --git a/Myshipping.Application/ConfigOption/Mapper.cs b/Myshipping.Application/ConfigOption/Mapper.cs index d467a682..fa182799 100644 --- a/Myshipping.Application/ConfigOption/Mapper.cs +++ b/Myshipping.Application/ConfigOption/Mapper.cs @@ -33,6 +33,11 @@ namespace Myshipping.Application config.ForType() .Map(dest => dest.CreatedTime, src => src.CreatedTime.HasValue ? src.CreatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty); + + + config.ForType() + .Map(dest => dest.CreatedTime, src => src.CreatedTime.HasValue ? src.CreatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null) + .Map(dest => dest.UpdatedTime, src => src.UpdatedTime.HasValue ? src.UpdatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null); } } } \ No newline at end of file diff --git a/Myshipping.Application/Entity/BookingOrder.cs b/Myshipping.Application/Entity/BookingOrder.cs index 31672055..c1b4a498 100644 --- a/Myshipping.Application/Entity/BookingOrder.cs +++ b/Myshipping.Application/Entity/BookingOrder.cs @@ -1025,5 +1025,30 @@ namespace Myshipping.Application.Entity /// [Description("删除时间")] public DateTime? DeleteTime { get; set; } + + /// + /// 起运港唯一代码 + /// + public string PORTLOADCODE { get; set; } + + /// + /// 目的港唯一代码 + /// + public string PORTDISCHARGECODE { get; set; } + + /// + /// 目的地唯一代码 + /// + public string DESTINATIONCODE { get; set; } + + /// + /// 付费方式代码 + /// + public string FRTCODE { get; set; } + + /// + /// 运输条款代码 + /// + public string SERVICECODE { get; set; } } } \ No newline at end of file diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs index 1ced0a2e..1c74b850 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs @@ -827,6 +827,32 @@ namespace Myshipping.Application /// public decimal CtrnHeight { get; set; } + + /// + /// 起运港唯一代码 + /// + public string PORTLOADCODE { get; set; } + + /// + /// 目的港唯一代码 + /// + public string PORTDISCHARGECODE { get; set; } + + /// + /// 目的地唯一代码 + /// + public string DESTINATIONCODE { get; set; } + + /// + /// 付费方式代码 + /// + public string FRTCODE { get; set; } + + /// + /// 运输条款代码 + /// + public string SERVICECODE { get; set; } + /// /// 扩展状态 /// diff --git a/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs index c15ebbda..d27fdc34 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs @@ -255,6 +255,31 @@ namespace Myshipping.Application.Service.BookingOrder.Dto /// 订舱编号 /// public string CUSTNO { get; set; } + + /// + /// 起运港唯一代码 + /// + public string PORTLOADCODE { get; set; } + + /// + /// 目的港唯一代码 + /// + public string PORTDISCHARGECODE { get; set; } + + /// + /// 目的地唯一代码 + /// + public string DESTINATIONCODE { get; set; } + + /// + /// 付费方式代码 + /// + public string FRTCODE { get; set; } + + /// + /// 运输条款代码 + /// + public string SERVICECODE { get; set; } } /// diff --git a/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateOutput.cs b/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateOutput.cs index 6e6b12ac..faa120a3 100644 --- a/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateOutput.cs +++ b/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateOutput.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel.DataAnnotations; namespace Myshipping.Application { @@ -7,6 +8,25 @@ namespace Myshipping.Application /// public class BookingSoTemplateListOutput : BookingSoTemplateDto { + /// + /// 创建时间 + /// + public virtual string CreatedTime { get; set; } + + /// + /// 更新时间 + /// + public virtual string UpdatedTime { get; set; } + + /// + /// 创建者名称 + /// + public virtual string CreatedUserName { get; set; } + + /// + /// 修改者名称 + /// + public virtual string UpdatedUserName { get; set; } } From 9bc3d360697e236fb1b26dc628908e27e7df5923 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Wed, 3 Apr 2024 09:17:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?SendBookingOrder=E5=85=A5=E5=8F=82=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 9 +++++++++ .../Service/DataSync/Dto/BookingOrderDto.cs | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 48f281d3..a1dab1b4 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -9809,6 +9809,15 @@ namespace Myshipping.Application var childrens = await _rep.AsQueryable().Filter(null, true).Where(x => x.ParentId == item.Id && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync(); dto.childrens = childrens.Adapt>(); + + var files = await _bookingfile.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id).ToListAsync(); + dto.Files = files.Select(x => new ReceiveBcInfoDto.DownloadFile() + { + FileName = x.FileName, + FileType = x.TypeCode, + FilePath = x.FilePath + }).ToList(); + foreach (var childitem in dto.childrens) { var ctnInputs = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == childitem.Id && x.IsDeleted == false).ToListAsync(); diff --git a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs index 912aa9b7..36fe77c1 100644 --- a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using static Myshipping.Application.Service.BookingOrder.Dto.ReceiveBcInfoDto; namespace Myshipping.Application.Service.DataSync.Dto { @@ -827,6 +828,12 @@ namespace Myshipping.Application.Service.DataSync.Dto ///货物状态 /// public List GoodsStatus { get; set; } + + + /// + /// 附件列表 + /// + public List Files { get; set; } } From 881dd6a4d27b43ab7acd28830ea0c7ce933fa9ed Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Wed, 3 Apr 2024 10:35:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/Entity/BookingCustomerOrder.cs | 5 +++++ .../Entity/BookingSoTemplate/BookingSoTemplate.cs | 9 ++++++++- .../BookingCustomerOrderService.cs | 3 +-- .../Service/BookingCustomerOrder/Dto/Dtos.cs | 10 ++++++++++ .../BookingSoTemplate/Dto/BookingSoTemplateDto.cs | 5 +++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Entity/BookingCustomerOrder.cs b/Myshipping.Application/Entity/BookingCustomerOrder.cs index a3a4ce1a..4bad0842 100644 --- a/Myshipping.Application/Entity/BookingCustomerOrder.cs +++ b/Myshipping.Application/Entity/BookingCustomerOrder.cs @@ -313,6 +313,11 @@ namespace Myshipping.Application.Entity /// 运输条款代码 /// public string SERVICECODE { get; set; } + + /// + /// 船公司航线代码 + /// + public string LANECODE { get; set; } } /// diff --git a/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs b/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs index 9ce672a5..b88dfe3f 100644 --- a/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs +++ b/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs @@ -58,7 +58,14 @@ namespace Myshipping.Application.Entity [SugarColumn(ColumnName = "TemplateName")] [Description("模板名称")] public string TemplateName{ get; set; } - + + /// + /// 分类 + /// + [SugarColumn(ColumnName = "Category")] + [Description("分类")] + public string Category { get; set; } + /// /// 船司ID /// diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index c64fb54a..c8ce03e2 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -517,7 +517,6 @@ namespace Myshipping.Application } #endregion - #region 客户端操作与接口 /// /// 提交订舱 @@ -1769,6 +1768,7 @@ namespace Myshipping.Application var serviceList = await _cache.GetAllCodeService(); var frtList = await _cache.GetAllCodeFrt(); var ctnList = await _cache.GetAllCodeCtn(); + #region 校验 /* 1.必填字段：船公司，开船日期，起运港，目的港，箱型箱量，服务项目，运输条款，付费方式，件数，毛重，包装，货物标识，品名，HSCODE。 @@ -1974,7 +1974,6 @@ namespace Myshipping.Application custOrder.SERVICE = service.Name; custOrder.BLFRT = frt.EnName; - //订舱账号、密码 var jobj = new JObject(); if (!string.IsNullOrEmpty(custOrder.ExtendData)) diff --git a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs index b4b61873..7c30878a 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs @@ -325,6 +325,11 @@ namespace Myshipping.Application /// 运输条款代码 /// public string SERVICECODE { get; set; } + + /// + /// 船公司航线代码 + /// + public string LANECODE { get; set; } } //保存dto @@ -934,5 +939,10 @@ namespace Myshipping.Application /// 订舱密码 /// public string BOOKINGPASSWORD { get; set; } + + /// + /// 航线代码 + /// + public string LINECODE { get; set; } } } diff --git a/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs b/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs index fa92a42f..3a0c8fa1 100644 --- a/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs +++ b/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs @@ -47,6 +47,11 @@ namespace Myshipping.Application /// public string TemplateName { get; set; } + /// + /// 分类 + /// + public string Category { get; set; } + /// /// 船司ID ///