Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs

@@ -395,6 +395,9 @@ public class ClientCommonService : IClientCommonService
             case "J"://件数
                 data.Quantity = seaExport.PKGS;
                 break;
+            case "TEU"://TEU
+                data.Quantity = seaExport.TEU;
+                break;
             case "JF"://计费吨
                 data.Quantity = seaExport.KGS / 1000 > seaExport.CBM ? seaExport.KGS / 1000 : seaExport.CBM;
                 break;
@@ -1250,7 +1253,8 @@ public class ClientCommonService : IClientCommonService
     public async Task<DataResult<List<ClientSelectRes>>> GetClientListByCode(string code = "", string queryKey = "")
     {
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
-
+        var sql = "select  CreateBy As UserIds from info_client_stakeholder where  SYSDATE() BETWEEN  StartDate and EndDate  AND ClientId ={0}";
+   
         //code = code.ToLower();
         var data = await tenantDb.Queryable<InfoClient>()
             .InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
@@ -1286,7 +1290,8 @@ public class ClientCommonService : IClientCommonService
                 BLContent = a.BLContent,
                 PinYinCode = a.ShortName + "(" + a.CodeName + ")"
             }
-            ).MergeTable().OrderBy(x => x.CodeName).Take(20).WithCache($"{SqlSugarCacheConst.InfoClient}{user.TenantId}", SqlSugarCacheConst.CacheDurationInSeconds).ToListAsync();
+            )
+            .MergeTable().OrderBy(x => x.CodeName).Take(20).WithCache($"{SqlSugarCacheConst.InfoClient}{user.TenantId}", SqlSugarCacheConst.CacheDurationInSeconds).ToListAsync();
         return await Task.FromResult(DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess));
     }