diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 21e17ef2..f85cdc1b 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -205,7 +205,7 @@ namespace Myshipping.Application [HttpPost("/BookingOrder/PageData")] public async Task PageData(BookingOrderInput input) { - + List userlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder); List pidlist = new List(); if (!string.IsNullOrWhiteSpace(input.SEALNO) || !string.IsNullOrWhiteSpace(input.CNTRNO)) @@ -237,7 +237,7 @@ namespace Myshipping.Application .WhereIF(input.ISDel, x => x.IsDeleted == true) .WhereIF(input.firstFlag, x => (x.ETD <= etoday && x.ETD >= ftoday || x.ETD == null) && x.CreatedUserId == UserManager.UserId) //首次加载数据:ETD前后15天,且创建人是当前人 .Where(x => x.ParentId == 0 || x.ParentId == null) //台账只查询主单!! - .WhereIF( input.Id!=0,x=>x.Id==input.Id) + .WhereIF(input.Id != 0, x => x.Id == input.Id) .WhereIF(pidlist != null && pidlist.Count > 0, x => pidlist.Contains(x.Id)) .WhereIF(!string.IsNullOrWhiteSpace(input.BSNO), u => u.BSNO.Contains(input.BSNO)) .WhereIF(!string.IsNullOrWhiteSpace(input.BSSTATUS), u => u.BSSTATUS == input.BSSTATUS) @@ -924,7 +924,7 @@ namespace Myshipping.Application var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == Id).ToListAsync(); var ctninput = ctnlist.Adapt>(); var ctnIdlist = ctnlist.Select(x => x.Id).ToList(); - var ctndetaillist= await _ctndetailrep.AsQueryable().Where(x => ctnIdlist.Contains((long)x.CTNID)).ToListAsync(); + var ctndetaillist = await _ctndetailrep.AsQueryable().Where(x => ctnIdlist.Contains((long)x.CTNID)).ToListAsync(); foreach (var item in ctninput) { var _ctndetaillist = ctndetaillist.Where(x => x.CTNID == item.Id).ToList(); @@ -986,6 +986,34 @@ namespace Myshipping.Application return ordOut; } + /// + /// 在订舱台账保存单证备注、操作备注等功能 + /// + /// + /// + [HttpPost("/BookingOrder/SaveInList")] + public async Task SaveInList(BookingOrderSaveInListDto model) + { + var order = await _rep.AsQueryable().Filter(null, true).FirstAsync(x => x.Id == model.Id); + if (order == null) + { + throw Oops.Bah("订舱数据不存在"); + } + + //判断权限 + List userlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder, true); + if (!userlist.Contains(UserManager.UserId)) + { + throw Oops.Bah("无权修改"); + } + + model.Adapt(order); + order.VERSION = Guid.NewGuid().ToString(); + await _rep.UpdateAsync(order); + + //todo:记录修改日志,等待抽取方法 + + } /// /// 删除订舱 diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs index 1fbdf904..985c9a9f 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs @@ -812,4 +812,24 @@ namespace Myshipping.Application /// public string VERSION { get; set; } } + + /// + /// 台账保存(操作备注、单证备注)功能 + /// + public class BookingOrderSaveInListDto + { + /// + /// 主键 + /// + public long Id { get; set; } + /// + /// 单证备注 + /// + public string DZRemark { get; set; } + /// + /// 操作备注 + /// + public string CZRemark { get; set; } + + } } diff --git a/Myshipping.Web.Core/applicationconfig.json b/Myshipping.Web.Core/applicationconfig.json index 77c12f43..f7294c45 100644 --- a/Myshipping.Web.Core/applicationconfig.json +++ b/Myshipping.Web.Core/applicationconfig.json @@ -46,7 +46,7 @@ "ValidateAudience": true, // 是否验证签收方,bool 类型,默认true "ValidAudience": "myshipping", // 签收方,string 类型 "ValidateLifetime": true, // 是否验证过期时间,bool 类型,默认true,建议true - "ExpiredTime": 1440, // 过期时间,long 类型,单位分钟,默认20分钟 + "ExpiredTime": 720, // 过期时间,long 类型,单位分钟,默认20分钟 "ClockSkew": 5 // 过期时间容错值,long 类型,单位秒,默认5秒 }, "EncryptKey": {