Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

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);
@@ -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 fileList = _repFile.AsQueryable().Filter(null, true).Where(x => ordIdList.Contains(x.BookingId)).ToList();
-            var serviceItemList = _repServiceItem.AsQueryable().Where(x => ordIdList.Contains(x.BookingId.Value)).ToList();
+            var serviceItemList = _repServiceItem.AsQueryable().Filter(null, true).Where(x => ordIdList.Contains(x.BookingId.Value)).ToList();
             var sendList = new List<BookingCustomerSubmitDto>();
 
             var opt = App.GetOptions<BookingAttachOptions>();
@@ -1843,7 +1843,7 @@ namespace Myshipping.Application
             {
                 if (custOrder.BSSTATUS == "已审核")
                 {
-                    throw Oops.Bah("当前状态不能修改");
+                    throw Oops.Bah("已审核的数据不能修改");
                 }
 
                 if (custOrder.BSSTATUS == "已提交")