diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml index 46bc84df..624560dc 100644 --- a/Myshipping.Application/Myshipping.Application.xml +++ b/Myshipping.Application/Myshipping.Application.xml @@ -11247,7 +11247,7 @@ - + 获取打印模板权限 @@ -15889,6 +15889,23 @@ 文件功能 (9原始) 返回结果 + + + 更新订舱的状态 + + 订舱主键 + 状态代码 + 状态名称 + + + + + 扣费 + + 任务信息 + 是否执行扣费 true-执行扣费 false-不执行扣费(主要是符合扣费条件但是由于超时没有得到准确回执) + 返回回执 + 获取订舱详情 diff --git a/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs b/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs index 66532a5f..94d22068 100644 --- a/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs +++ b/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs @@ -417,7 +417,7 @@ namespace Myshipping.Application UserName = "", }).ToListAsync(); - list = list.WhereIF(!string.IsNullOrWhiteSpace(cateCode), x => x.CateCode == cateCode).WhereIF(!string.IsNullOrWhiteSpace(displayName), x => x.DisplayName.StartsWith(displayName)). + list = list.WhereIF(!string.IsNullOrWhiteSpace(cateCode), x => x.CateCode == cateCode).WhereIF(!string.IsNullOrWhiteSpace(displayName), x => x.DisplayName.ToUpper().StartsWith(displayName.ToUpper())). WhereIF(!string.IsNullOrWhiteSpace(type), x => x.Type == type).ToList(); foreach (var item in list) {