chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
usertest
dengyu 4 months ago
parent 131c6d50d0 33251e1a3f
commit 8e761723ad
13 changed files with 125 additions and 46 deletions
Show Stats Download Patch File Download Diff File

8
ds-wms-service/DS.WMS.Core/Code/Method/CodeGoodsService.cs
Unescape Escape View File

@ -103,7 +103,7 @@ public class CodeGoodsService:ICodeGoodsService
var data = req.Adapt<CodeGoods>(); var data = req.Adapt<CodeGoods>();
var entity = tenantDb.Insertable(data).RemoveDataCache(SqlSugarCacheConst.Goods + user.TenantId).ExecuteReturnEntity(); var entity = tenantDb.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.Goods}{user.TenantId}").ExecuteReturnEntity();
return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess); return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
} }
@ -113,7 +113,7 @@ public class CodeGoodsService:ICodeGoodsService
info = req.Adapt(info); info = req.Adapt(info);
tenantDb.Updateable(info).RemoveDataCache(SqlSugarCacheConst.Goods + user.TenantId).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); tenantDb.Updateable(info).RemoveDataCache($"{SqlSugarCacheConst.Goods}{user.TenantId}").IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess); return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
} }
} }
@ -157,7 +157,7 @@ public class CodeGoodsService:ICodeGoodsService
return DataResult.Failed("存在已导入的商品!",MultiLanguageConst.CodeGoodsImportAlready); return DataResult.Failed("存在已导入的商品!",MultiLanguageConst.CodeGoodsImportAlready);
} }
tenantDb.Insertable(list).RemoveDataCache(SqlSugarCacheConst.Goods + user.TenantId).ExecuteCommand(); tenantDb.Insertable(list).RemoveDataCache($"{SqlSugarCacheConst.Goods}{user.TenantId}").ExecuteCommand();
return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess); return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess);
} }
@ -180,7 +180,7 @@ public class CodeGoodsService:ICodeGoodsService
var list = tenantDb.Queryable<CodeGoods>().Where(x => req.Ids.Contains(x.Id)).ToList(); var list = tenantDb.Queryable<CodeGoods>().Where(x => req.Ids.Contains(x.Id)).ToList();
if (list.Count > 0) if (list.Count > 0)
{ {
tenantDb.Deleteable(list).RemoveDataCache(SqlSugarCacheConst.Goods + user.TenantId).ExecuteCommand(); tenantDb.Deleteable(list).RemoveDataCache($"{SqlSugarCacheConst.Goods}{user.TenantId}").ExecuteCommand();
} }
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess); return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
} }

12
ds-wms-service/DS.WMS.Core/Code/Method/CodePackageService.cs
Unescape Escape View File

@ -53,7 +53,7 @@ public class CodePackageService:ICodePackageService
var data = req.Adapt<CodePackage>(); var data = req.Adapt<CodePackage>();
var entity = db.Insertable(data).RemoveDataCache(SqlSugarCacheConst.Package + user.TenantId).ExecuteReturnEntity(); var entity = db.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.Package}{user.TenantId}").ExecuteReturnEntity();
return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess); return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
} }
@ -63,7 +63,7 @@ public class CodePackageService:ICodePackageService
info = req.Adapt(info); info = req.Adapt(info);
db.Updateable(info).RemoveDataCache(SqlSugarCacheConst.Package + user.TenantId).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); db.Updateable(info).RemoveDataCache($"{SqlSugarCacheConst.Package}{user.TenantId}").IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess); return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
} }
} }
@ -101,7 +101,7 @@ public class CodePackageService:ICodePackageService
var data = req.Adapt<CodePackage>(); var data = req.Adapt<CodePackage>();
var entity = tenantDb.Insertable(data).RemoveDataCache(SqlSugarCacheConst.Package + user.TenantId).ExecuteReturnEntity(); var entity = tenantDb.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.Package}{user.TenantId}").ExecuteReturnEntity();
return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess); return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
} }
@ -111,7 +111,7 @@ public class CodePackageService:ICodePackageService
info = req.Adapt(info); info = req.Adapt(info);
tenantDb.Updateable(info).RemoveDataCache(SqlSugarCacheConst.Package + user.TenantId).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); tenantDb.Updateable(info).RemoveDataCache($"{SqlSugarCacheConst.Package}{user.TenantId}").IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess); return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
} }
} }
@ -154,7 +154,7 @@ public class CodePackageService:ICodePackageService
return DataResult.Failed("存在已导入的包装类型!",MultiLanguageConst.CodePackageImportAlready); return DataResult.Failed("存在已导入的包装类型!",MultiLanguageConst.CodePackageImportAlready);
} }
tenantDb.Insertable(list).RemoveDataCache(SqlSugarCacheConst.Package + user.TenantId).ExecuteCommand(); tenantDb.Insertable(list).RemoveDataCache($"{SqlSugarCacheConst.Package}{user.TenantId}").ExecuteCommand();
return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess); return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess);
} }
@ -176,7 +176,7 @@ public class CodePackageService:ICodePackageService
var list = tenantDb.Queryable<CodePackage>().Where(x => req.Ids.Contains(x.Id)).ToList(); var list = tenantDb.Queryable<CodePackage>().Where(x => req.Ids.Contains(x.Id)).ToList();
if (list.Count > 0) if (list.Count > 0)
{ {
tenantDb.Deleteable(list).RemoveDataCache(SqlSugarCacheConst.Package + user.TenantId).ExecuteCommand(); tenantDb.Deleteable(list).RemoveDataCache($"{SqlSugarCacheConst.Package}{user.TenantId}").ExecuteCommand();
} }
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess); return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
} }

10
ds-wms-service/DS.WMS.Core/Code/Method/CodeVesselService.cs
Unescape Escape View File

@ -110,7 +110,7 @@ public class CodeVesselService : ICodeVesselService
var data = req.Adapt<CodeVessel>(); var data = req.Adapt<CodeVessel>();
var entity = tenantDb.Insertable(data).RemoveDataCache(SqlSugarCacheConst.Vessel + user.TenantId).ExecuteReturnEntity(); var entity = tenantDb.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.Vessel}{user.TenantId}").ExecuteReturnEntity();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeVessel, "DS8").GetAwaiter().GetResult(); _sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeVessel, "DS8").GetAwaiter().GetResult();
@ -122,7 +122,7 @@ public class CodeVesselService : ICodeVesselService
info = req.Adapt(info); info = req.Adapt(info);
tenantDb.Updateable(info).RemoveDataCache(SqlSugarCacheConst.Vessel + user.TenantId).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); tenantDb.Updateable(info).RemoveDataCache($"{SqlSugarCacheConst.Vessel}{user.TenantId}").IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeVessel, "DS8").GetAwaiter().GetResult(); _sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeVessel, "DS8").GetAwaiter().GetResult();
@ -168,7 +168,7 @@ public class CodeVesselService : ICodeVesselService
return DataResult.Failed("存在已导入的船名信息!", MultiLanguageConst.CodeVesselImportAlready); return DataResult.Failed("存在已导入的船名信息!", MultiLanguageConst.CodeVesselImportAlready);
} }
tenantDb.Insertable(list).RemoveDataCache(SqlSugarCacheConst.Vessel + user.TenantId).ExecuteCommand(); tenantDb.Insertable(list).RemoveDataCache($"{SqlSugarCacheConst.Vessel}{user.TenantId}").ExecuteCommand();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeVessel, "DS8").GetAwaiter().GetResult(); _sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeVessel, "DS8").GetAwaiter().GetResult();
@ -195,8 +195,8 @@ public class CodeVesselService : ICodeVesselService
{ {
var voynos = tenantDb.Queryable<CodeVoyno>().Where(x => req.Ids.Contains(x.VesselId)).ToList(); var voynos = tenantDb.Queryable<CodeVoyno>().Where(x => req.Ids.Contains(x.VesselId)).ToList();
if (voynos.Count > 0) if (voynos.Count > 0)
tenantDb.Deleteable(voynos).RemoveDataCache(SqlSugarCacheConst.Voyno + user.TenantId).ExecuteCommand(); tenantDb.Deleteable(voynos).RemoveDataCache($"{SqlSugarCacheConst.Voyno}{user.TenantId}").ExecuteCommand();
tenantDb.Deleteable(list).RemoveDataCache(SqlSugarCacheConst.Vessel + user.TenantId).ExecuteCommand(); tenantDb.Deleteable(list).RemoveDataCache($"{SqlSugarCacheConst.Vessel}{user.TenantId}").ExecuteCommand();
} }
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess); return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
} }

8
ds-wms-service/DS.WMS.Core/Code/Method/CodeVoynoService.cs
Unescape Escape View File

@ -103,7 +103,7 @@ public class CodeVoynoService:ICodeVoynoService
var data = req.Adapt<CodeVoyno>(); var data = req.Adapt<CodeVoyno>();
var entity = tenantDb.Insertable(data).RemoveDataCache(SqlSugarCacheConst.Voyno + user.TenantId).ExecuteReturnEntity(); var entity = tenantDb.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.Voyno}{user.TenantId}").ExecuteReturnEntity();
return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess); return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
} }
@ -113,7 +113,7 @@ public class CodeVoynoService:ICodeVoynoService
info = req.Adapt(info); info = req.Adapt(info);
tenantDb.Updateable(info).RemoveDataCache(SqlSugarCacheConst.Voyno + user.TenantId).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); tenantDb.Updateable(info).RemoveDataCache($"{SqlSugarCacheConst.Voyno}{user.TenantId}").IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess); return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
} }
} }
@ -158,7 +158,7 @@ public class CodeVoynoService:ICodeVoynoService
return DataResult.Failed("存在已导入的航次信息!",MultiLanguageConst.CodeVoynoImportAlready); return DataResult.Failed("存在已导入的航次信息!",MultiLanguageConst.CodeVoynoImportAlready);
} }
tenantDb.Insertable(list).RemoveDataCache(SqlSugarCacheConst.Voyno + user.TenantId).ExecuteCommand(); tenantDb.Insertable(list).RemoveDataCache($"{SqlSugarCacheConst.Voyno}{user.TenantId}").ExecuteCommand();
return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess); return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess);
} }
@ -181,7 +181,7 @@ public class CodeVoynoService:ICodeVoynoService
var list = tenantDb.Queryable<CodeVoyno>().Where(x => req.Ids.Contains(x.Id)).ToList(); var list = tenantDb.Queryable<CodeVoyno>().Where(x => req.Ids.Contains(x.Id)).ToList();
if (list.Count > 0) if (list.Count > 0)
{ {
tenantDb.Deleteable(list).RemoveDataCache(SqlSugarCacheConst.Voyno + user.TenantId).ExecuteCommand(); tenantDb.Deleteable(list).RemoveDataCache($"{SqlSugarCacheConst.Voyno}{user.TenantId}").ExecuteCommand();
} }
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess); return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
} }

6
ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs
Unescape Escape View File

@ -75,7 +75,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
var entity = TenantDb.InsertNav(data).Include(x => x.InvoiceHeaders).ExecuteReturnEntity(); var entity = TenantDb.InsertNav(data).Include(x => x.InvoiceHeaders).ExecuteReturnEntity();
tag.ClientId = entity.Id; tag.ClientId = entity.Id;
TenantDb.Insertable(tag).RemoveDataCache(SqlSugarCacheConst.InfoClient + User.TenantId).ExecuteCommand(); TenantDb.Insertable(tag).RemoveDataCache($"{SqlSugarCacheConst.InfoClient}{User.TenantId}").ExecuteCommand();
return DataResult.Successed("添加成功!", entity.Id, MultiLanguageConst.DataCreateSuccess); return DataResult.Successed("添加成功!", entity.Id, MultiLanguageConst.DataCreateSuccess);
} }
else else
@ -86,7 +86,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
info = req.Adapt(info); info = req.Adapt(info);
tag = req.ClientTag.Adapt(tag); tag = req.ClientTag.Adapt(tag);
TenantDb.Updateable(info).RemoveDataCache(SqlSugarCacheConst.InfoClient + User.TenantId).IgnoreColumns(ignoreAllNullColumns: true).EnableDiffLogEvent().ExecuteCommand(); TenantDb.Updateable(info).RemoveDataCache($"{SqlSugarCacheConst.InfoClient}{User.TenantId}").IgnoreColumns(ignoreAllNullColumns: true).EnableDiffLogEvent().ExecuteCommand();
TenantDb.Updateable(tag).IgnoreColumns(ignoreAllNullColumns: true).EnableDiffLogEvent().ExecuteCommand(); TenantDb.Updateable(tag).IgnoreColumns(ignoreAllNullColumns: true).EnableDiffLogEvent().ExecuteCommand();
//创建或更新发票抬头 //创建或更新发票抬头
@ -186,7 +186,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
//收发货人 //收发货人
await TenantDb.Deleteable<InfoClientShipper>().Where(x => req.Ids.Contains(x.ClientId)).ExecuteCommandAsync(); await TenantDb.Deleteable<InfoClientShipper>().Where(x => req.Ids.Contains(x.ClientId)).ExecuteCommandAsync();
//删除客户信息 //删除客户信息
await TenantDb.Deleteable<InfoClient>().RemoveDataCache(SqlSugarCacheConst.InfoClient + User.TenantId).Where(x => req.Ids.Contains(x.Id)).ExecuteCommandAsync(); await TenantDb.Deleteable<InfoClient>().RemoveDataCache($"{SqlSugarCacheConst.InfoClient}{User.TenantId}").Where(x => req.Ids.Contains(x.Id)).ExecuteCommandAsync();
await TenantDb.Ado.CommitTranAsync(); await TenantDb.Ado.CommitTranAsync();
return DataResult.Success; return DataResult.Success;

8
ds-wms-service/DS.WMS.Core/Sys/Dtos/UserReq.cs
Unescape Escape View File

@ -175,9 +175,13 @@ public class UserReq
public string SourceName { get; set; } = ""; public string SourceName { get; set; } = "";
/// <summary> /// <summary>
/// 签名照片Url /// 签名图片
/// </summary> /// </summary>
public string SignatureUrl { get; set; } = ""; public string SignatureUrl { get; set; } = "";
/// <summary>
/// 邮件签名
/// </summary>
public string SignatureHtml { get; set; } = "";
} }
/// <summary> /// <summary>

8
ds-wms-service/DS.WMS.Core/Sys/Dtos/UserSelectRes.cs
Unescape Escape View File

@ -66,4 +66,12 @@ public class UserSelectRes
/// 财务软件代码 /// 财务软件代码
/// </summary> /// </summary>
public string FinanceSoftCode { get; set; } public string FinanceSoftCode { get; set; }
/// <summary>
/// 签名图片
/// </summary>
public string SignatureUrl { get; set; } = "";
/// <summary>
/// 邮件签名
/// </summary>
public string SignatureHtml { get; set; } = "";
} }

6
ds-wms-service/DS.WMS.Core/Sys/Dtos/UserViewModel.cs
Unescape Escape View File

@ -192,7 +192,11 @@ public class UserViewModel
public string SourceName { get; set; } = ""; public string SourceName { get; set; } = "";
/// <summary> /// <summary>
/// 签名照片Url /// 签名图片
/// </summary> /// </summary>
public string SignatureUrl { get; set; } = ""; public string SignatureUrl { get; set; } = "";
/// <summary>
/// 邮件签名
/// </summary>
public string SignatureHtml { get; set; } = "";
} }

12
ds-wms-service/DS.WMS.Core/Sys/Entity/SysUser.cs
Unescape Escape View File

@ -205,5 +205,15 @@ public class SysUser : UserTenantModel<long>
/// </summary> /// </summary>
[Description("是否派车调度人员")] [Description("是否派车调度人员")]
public bool IsDispatcher { get; set; } = false; public bool IsDispatcher { get; set; } = false;
/// <summary>
/// 签名图片
/// </summary>
[Description("签名图片")]
public string SignatureUrl { get; set; }
/// <summary>
/// 邮件签名
/// </summary>
[Description("邮件签名")]
public string SignatureHtml { get; set; }
} }

32
ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs
Unescape Escape View File

@ -76,7 +76,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.GoodsCode.Contains(queryKey) || a.GoodName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.GoodsCode.Contains(queryKey) || a.GoodName.Contains(queryKey))
.Select<CodeGoodsSelectRes>() .Select<CodeGoodsSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.Goods + user.TenantId) .WithCache($"{SqlSugarCacheConst.Goods}{user.TenantId}")
.ToListAsync(); .ToListAsync();
return await Task.FromResult(DataResult<List<CodeGoodsSelectRes>>.Success("获取数据成功!", list)); return await Task.FromResult(DataResult<List<CodeGoodsSelectRes>>.Success("获取数据成功!", list));
} }
@ -105,7 +105,7 @@ public class ClientCommonService : IClientCommonService
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && ids.Contains(a.Id)) .Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && ids.Contains(a.Id))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToListAsync(); .ToListAsync();
return await Task.FromResult(DataResult<List<UserSelectRes>>.Success(data)); return await Task.FromResult(DataResult<List<UserSelectRes>>.Success(data));
} }
@ -134,7 +134,7 @@ public class ClientCommonService : IClientCommonService
Value = a.Id, Value = a.Id,
}) })
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToListAsync(); .ToListAsync();
return DataResult<List<ApiSelectViewModel>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<ApiSelectViewModel>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1005,7 +1005,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<SaleSelectListRes>() .Select<SaleSelectListRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
if (list.Count > 0) if (list.Count > 0)
{ {
@ -1110,7 +1110,7 @@ public class ClientCommonService : IClientCommonService
BLContent = a.BLContent, BLContent = a.BLContent,
PinYinCode = a.ShortName + "(" + a.CodeName + ")" PinYinCode = a.ShortName + "(" + a.CodeName + ")"
} }
).Take(20).WithCache(SqlSugarCacheConst.InfoClient + user.TenantId).ToListAsync(); ).Take(20).WithCache($"{SqlSugarCacheConst.InfoClient}{user.TenantId}").ToListAsync();
return await Task.FromResult(DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess)); return await Task.FromResult(DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess));
} }
/// <summary> /// <summary>
@ -1590,7 +1590,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.PackageName.Contains(queryKey) || a.EdiCode.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.PackageName.Contains(queryKey) || a.EdiCode.Contains(queryKey))
.Select<CodePackageSelectRes>() .Select<CodePackageSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.Package + user.TenantId) .WithCache($"{SqlSugarCacheConst.Package}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<CodePackageSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<CodePackageSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1606,7 +1606,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.VesselName.Contains(queryKey) || a.EdiCode.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.VesselName.Contains(queryKey) || a.EdiCode.Contains(queryKey))
.Select<CodeVesselSelectRes>() .Select<CodeVesselSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.Vessel + user.TenantId) .WithCache($"{SqlSugarCacheConst.Vessel}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<CodeVesselSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<CodeVesselSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1622,7 +1622,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.VoyNo.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.VoyNo.Contains(queryKey))
.Select<CodeVoynoSelectRes>() .Select<CodeVoynoSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.Voyno + user.TenantId) .WithCache($"{SqlSugarCacheConst.Voyno}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<CodeVoynoSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<CodeVoynoSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1663,7 +1663,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1679,7 +1679,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1694,7 +1694,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1710,7 +1710,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1726,7 +1726,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1742,7 +1742,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1758,7 +1758,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }
@ -1773,7 +1773,7 @@ public class ClientCommonService : IClientCommonService
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey)) .WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>() .Select<UserSelectRes>()
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId) .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToList(); .ToList();
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
} }

2
ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs
Unescape Escape View File

@ -936,7 +936,7 @@ public class CommonService : ICommonService
Value = a.Id, Value = a.Id,
}) })
.Take(20) .Take(20)
.WithCache(SqlSugarCacheConst.User + user.TenantId).ToList(); .WithCache($"{SqlSugarCacheConst.User}{user.TenantId}").ToList();
return DataResult<List<ApiSelectViewModel>>.Success("获取数据成功!", list); return DataResult<List<ApiSelectViewModel>>.Success("获取数据成功!", list);
} }

6
ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs
Unescape Escape View File

@ -131,7 +131,7 @@ public class UserService : IUserService
data.PinYinCode = data.UserName + "(" + PinYinUtil.GetFristLetter(data.UserName) + ")"; data.PinYinCode = data.UserName + "(" + PinYinUtil.GetFristLetter(data.UserName) + ")";
data.MD5Password = MD5Helper.MD5Encrypt(data.Password); data.MD5Password = MD5Helper.MD5Encrypt(data.Password);
var entity = db.Insertable(data).RemoveDataCache(SqlSugarCacheConst.User + user.TenantId).ExecuteReturnEntity(); var entity = db.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.User}{user.TenantId}").ExecuteReturnEntity();
if (model.RoleIds.IsNotNull() && model.RoleIds.Count() > 0) if (model.RoleIds.IsNotNull() && model.RoleIds.Count() > 0)
{ {
@ -180,7 +180,7 @@ public class UserService : IUserService
info = model.MapTo<UserReq, SysUser>(); info = model.MapTo<UserReq, SysUser>();
info.PinYinCode = info.UserName + "(" + PinYinUtil.GetFristLetter(info.UserName) + ")"; info.PinYinCode = info.UserName + "(" + PinYinUtil.GetFristLetter(info.UserName) + ")";
db.Updateable(info).RemoveDataCache(SqlSugarCacheConst.User + user.TenantId).IgnoreColumns(it => new { it.TenantId,it.TenantName, it.Password,it.MD5Password }).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); db.Updateable(info).RemoveDataCache($"{SqlSugarCacheConst.User}{user.TenantId}").IgnoreColumns(it => new { it.TenantId,it.TenantName, it.Password,it.MD5Password }).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
#region 处理用户角色 #region 处理用户角色
@ -302,7 +302,7 @@ public class UserService : IUserService
if (userLanes.Count > 0) if (userLanes.Count > 0)
await db.Deleteable(userLanes).ExecuteCommandAsync(); await db.Deleteable(userLanes).ExecuteCommandAsync();
} }
await db.Deleteable(list).RemoveDataCache(SqlSugarCacheConst.User + user.TenantId).ExecuteCommandAsync(); await db.Deleteable(list).RemoveDataCache($"{SqlSugarCacheConst.User}{user.TenantId}").ExecuteCommandAsync();
} }
return await Task.FromResult(DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess)); return await Task.FromResult(DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess));

53
ds-wms-service/DS.WMS.OpApi/Controllers/BusinessCtnPriceController.cs
Unescape Escape View File

@ -0,0 +1,53 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Code.Interface;
using DS.WMS.Core.Op.Dtos;
using DS.WMS.Core.Op.Interface;
using Microsoft.AspNetCore.Mvc;
namespace DS.WMS.OpApi.Controllers;
/// <summary>
/// 集装箱报价-服务
/// </summary>
public class BusinessCtnPriceController : ApiController
{
private readonly IBusinessCtnPriceService _invokeService;
/// <summary>
/// 构造函数
/// </summary>
/// <param name="invokeService"></param>
public BusinessCtnPriceController(IBusinessCtnPriceService invokeService)
{
_invokeService = invokeService;
}
/// <summary>
/// 列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
[Route("GetBusinessCtnPriceList")]
public async Task<DataResult<List<BusinessCtnPriceRes>>> GetBusinessCtnPriceList([FromBody] PageRequest request)
{
var res = await _invokeService.GetListByPage(request);
return res;
}
/// <summary>
/// 批量删除
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[HttpPost]
[Route("BatchDelBusinessCtnPrice")]
public async Task<DataResult> BatchDelBusinessCtnPrice([FromBody] IdModel req)
{
var res = await _invokeService.BatchDelBusinessCtnPrice(req);
return res;
}
}
Write Preview
Loading…
Cancel
Save