From 01a66bb134affd215dab2d198f053e19dfddc51b Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Fri, 28 Apr 2023 17:34:29 +0800 Subject: [PATCH 1/2] 1 --- Myshipping.Core/Myshipping.Core.xml | 4 ++-- Myshipping.Core/Service/CommonDB/CommonDBService.cs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 6933d695..b8d3db99 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -8958,9 +8958,9 @@ 关键字 - + - 英文名 + 英文名/中文名 diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs index 358ade1b..dbf9aaa5 100644 --- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs +++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs @@ -1585,7 +1585,9 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie var queryList = list .WhereIF(!string.IsNullOrEmpty(input.Name),x=> x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase) - || x.CnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase) ) .WhereIF(!string.IsNullOrEmpty(input.KeyWord), + || x.Code.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase)|| x.CnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase) + ) + .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => (!string.IsNullOrWhiteSpace(x.Code) && x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)) || (!string.IsNullOrWhiteSpace(x.EnName) && x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)) || (!string.IsNullOrWhiteSpace(x.CnName) && x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)) From 2381beee31acdc4d44aeb7ce05a8216d3affe07c Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Thu, 4 May 2023 11:35:30 +0800 Subject: [PATCH 2/2] 1 --- .../Service/BookingOrder/BookingOrderService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 349bed55..55c05a1e 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -5579,11 +5579,11 @@ namespace Myshipping.Application var CtnDayNumlist = await GetGoodsStatusList(item.Id); item.CtnDayNum = CtnDayNumlist.Where(x => x.StatusName == "申请箱使").Select(x => x.ExtData).FirstOrDefault(); - if (!string.IsNullOrEmpty(item.ISSUETYPE)) - { - var ISSUETYPE = _cache.GetAllMappingIssueType().Result.Where(x => x.Module == "HeChuan" && x.Code == item.ISSUETYPE).Select(x => x.MapName).FirstOrDefault(); - item.ISSUETYPE = ISSUETYPE; - } + //if (!string.IsNullOrEmpty(item.ISSUETYPE)) + //{ + // var ISSUETYPE = _cache.GetAllMappingIssueType().Result.Where(x => x.Module == "HeChuan" && x.Code == item.ISSUETYPE).Select(x => x.MapName).FirstOrDefault(); + // item.ISSUETYPE = ISSUETYPE; + //} var ctn = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == item.Id).ToListAsync(); item.ctnInputs = ctn.Adapt>();