From e18f6fcafdcdc09d205d3aadf6385d15ce0b21b0 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng Date: Fri, 15 Mar 2024 19:13:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E8=AE=A2=E8=88=B1=E9=9C=80=E6=B1=82=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BF=90=E8=90=A5=E7=AB=AF=E6=97=B6=E7=AE=B1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingCustomerOrder/BookingCustomerOrderService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index c97ac0cb..af9cde05 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -571,7 +571,7 @@ namespace Myshipping.Application } var ordIdList = orderList.Select(o => o.Id).ToList(); - var ctnList = _repCtn.AsQueryable().Where(x => ordIdList.Contains(x.BILLID.Value)).ToList(); + var ctnList = _repCtn.AsQueryable().Filter(null, true).Where(x => ordIdList.Contains(x.BILLID.Value)).ToList(); //2023-9-1，衣国豪：点击发送订舱时，最少得填写船公司，船期，目的地，品名，箱型，箱量，重量，如果以上信息没填，允许保存，但是发送订舱时给出提示： XXX不能为空，请补充后重新发送 var emptyCtn = ctnList.Where(x => string.IsNullOrEmpty(x.CTNALL) || !x.CTNNUM.HasValue).Select(x => x.BILLID).Distinct().ToList(); @@ -581,8 +581,8 @@ namespace Myshipping.Application throw Oops.Bah($"箱型箱量不能为空：\r\n{string.Join("\r\n", emptyCtnOrd)}\r\n请补充后重新发送"); } - var fileList = _repFile.AsQueryable().Where(x => ordIdList.Contains(x.BookingId)).ToList(); - var serviceItemList = _repServiceItem.AsQueryable().Where(x => ordIdList.Contains(x.BookingId.Value)).ToList(); + var fileList = _repFile.AsQueryable().Filter(null, true).Where(x => ordIdList.Contains(x.BookingId)).ToList(); + var serviceItemList = _repServiceItem.AsQueryable().Filter(null, true).Where(x => ordIdList.Contains(x.BookingId.Value)).ToList(); var sendList = new List(); var opt = App.GetOptions(); From eba1cba36f4099db3470028830ef0c6730919571 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Mon, 18 Mar 2024 09:11:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingCustomerOrder/BookingCustomerOrderService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index af9cde05..d549f40c 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -175,14 +175,14 @@ namespace Myshipping.Application else { entity = await _rep.AsQueryable().Filter(null, true).FirstAsync(x => x.Id == input.Id); - if (entity.BSSTATUS != "已录入" && entity.BSSTATUS != "已驳回") + if (entity.BSSTATUS == "已提交") { - throw Oops.Bah("当前状态不允许修改"); + throw Oops.Bah("请先撤销提交后再修改"); } - if (string.IsNullOrEmpty(entity.VOYNO)) + if (entity.BSSTATUS == "已审核") { - entity.VOYNO = entity.VOYNOINNER; + throw Oops.Bah("已审核的数据不允许修改"); } entity = input.Adapt(entity); From 6b58a5461a228b69aef9140d7c90fd184e3715f5 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Mon, 18 Mar 2024 09:12:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingCustomerOrder/BookingCustomerOrderService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index d549f40c..3025085b 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -1843,7 +1843,7 @@ namespace Myshipping.Application { if (custOrder.BSSTATUS == "已审核") { - throw Oops.Bah("当前状态不能修改"); + throw Oops.Bah("已审核的数据不能修改"); } if (custOrder.BSSTATUS == "已提交")