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

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))
+                //if (!string.IsNullOrEmpty(item.ISSUETYPE))
-                {
+                //{
-                    var ISSUETYPE = _cache.GetAllMappingIssueType().Result.Where(x => x.Module == "HeChuan" && x.Code == item.ISSUETYPE).Select(x => x.MapName).FirstOrDefault();
+                //    var ISSUETYPE = _cache.GetAllMappingIssueType().Result.Where(x => x.Module == "HeChuan" && x.Code == item.ISSUETYPE).Select(x => x.MapName).FirstOrDefault();
-                    item.ISSUETYPE = ISSUETYPE;
+                //    item.ISSUETYPE = ISSUETYPE;
-                }
+                //}
 
                 var ctn = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == item.Id).ToListAsync();
                 item.ctnInputs = ctn.Adapt<List<BookingCtnDto>>();

Myshipping.Core/Myshipping.Core.xml

@@ -8958,9 +8958,9 @@
             关键字
             </summary>
         </member>
-        <member name="P:Myshipping.Core.Service.NameQueryDto.ENName">
+        <member name="P:Myshipping.Core.Service.NameQueryDto.Name">
             <summary>
-            英文名
+            英文名/中文名
             </summary>
         </member>
         <member name="P:Myshipping.Core.Service.NameQueryDto.Limit">

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))