From 012983a7a0e11ff7944146ab26256c6925fc95e7 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Mon, 21 Nov 2022 17:23:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingOrder/BookingOrderService.cs | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 9f20c82d..6ae77c2e 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -272,13 +272,21 @@ namespace Myshipping.Application { throw Oops.Bah("主单不需要填写分单号"); } + if (string.IsNullOrWhiteSpace(input.MBLNO)) + { + throw Oops.Bah("请填写提单号！"); + } } else { - if (!string.IsNullOrWhiteSpace(input.MBLNO)) + if (string.IsNullOrWhiteSpace(input.MBLNO)) { throw Oops.Bah("请填写主提单号"); } + if (string.IsNullOrWhiteSpace(input.HBLNO)) + { + throw Oops.Bah("请填写分提单号"); + } } @@ -359,13 +367,21 @@ namespace Myshipping.Application { throw Oops.Bah("主单不需要填写分单号"); } + if (string.IsNullOrWhiteSpace(input.MBLNO)) + { + throw Oops.Bah("请填写提单号！"); + } } else { - if (!string.IsNullOrWhiteSpace(input.MBLNO)) + if (string.IsNullOrWhiteSpace(input.MBLNO)) { throw Oops.Bah("请填写主提单号"); } + if (string.IsNullOrWhiteSpace(input.HBLNO)) + { + throw Oops.Bah("请填写分提单号"); + } } JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail"); JsonUtil.TrimFields(input); @@ -606,7 +622,8 @@ namespace Myshipping.Application FilePath = fileRelaPath, TypeCode = dto.TypeCode, TypeName = dto.TypeName, - BookingId = dto.BookingId + BookingId = dto.BookingId, + }; await _bookingfile.InsertAsync(newFile); using (var stream = File.Create(fileAbsPath)) From 52c76540db1c0fbc9b938dcde008a25d11efee59 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 22 Nov 2022 09:47:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9EDIRemark=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 9 ++++++++- .../Service/BookingOrder/Dto/BookingEDIMapper.cs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index e16501b1..4f9c5e92 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1732,11 +1732,16 @@ namespace Myshipping.Application primaryModel.KINDPKGS_EDI_CODE = ediPkgs.MapCode?.Trim(); + //这里是订舱时,默认取SOREMARK赋值到EDIREMARK + if (model.sendType == "B") + primaryModel.EDIREMARK = order.SOREMARK; + //箱信息 var contaList = _repCtn.AsQueryable().Where(t => t.BILLID == order.Id).ToList(); primaryModel.CTNLIST = new List(); + //集装箱 foreach (var conta in contaList) { @@ -1782,6 +1787,8 @@ namespace Myshipping.Application primaryModel.CTNGOODSLIST.Add(cargoModel); } + + //这里临时赋值，等明确对应的扩展表字段后赋值 #if DEBUG @@ -1791,7 +1798,7 @@ namespace Myshipping.Application primaryModel.SalesRepCode = "SALE1"; primaryModel.ACIHBL = String.Empty; primaryModel.S0CC0C = String.Empty; - primaryModel.EDIREMARK = String.Empty; + primaryModel.AMSCONSIGNEE = String.Empty; primaryModel.AMSNOTIFYPARTY = String.Empty; primaryModel.EDIATTN = "CEE1"; diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs index 92ce2a5f..e221ca84 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs @@ -24,7 +24,7 @@ namespace Myshipping.Application .Map(dest => dest.VESSEL, src => src.VESSEL) .Map(dest => dest.VOYNO, src => src.VOYNO) .Map(dest => dest.ETD, src => src.ETD.HasValue? src.ETD.Value.ToString("yyyy-MM-dd"):"") - //.Map(dest => dest.EDIREMARK, src => src.EDIREMARK) + //.Map(dest => dest.EDIREMARK, src => src.SOREMARK) .Map(dest => dest.SIREMARK, src => src.SIREMARK) .Map(dest => dest.SHIPPER, src => src.SHIPPER) .Map(dest => dest.CONSIGNEE, src => src.CONSIGNEE)