|
|
|
@ -11,13 +11,11 @@ using DS.WMS.Core.Flow.Interface;
|
|
|
|
|
using DS.WMS.Core.Info.Dtos;
|
|
|
|
|
using DS.WMS.Core.Info.Entity;
|
|
|
|
|
using DS.WMS.Core.Info.Interface;
|
|
|
|
|
using DS.WMS.Core.Invoice.Dtos;
|
|
|
|
|
using DS.WMS.Core.Op.Dtos.TaskInteraction;
|
|
|
|
|
using DS.WMS.Core.Op.Entity;
|
|
|
|
|
using DS.WMS.Core.Op.Interface.TaskInteraction;
|
|
|
|
|
using DS.WMS.Core.Sys.Entity;
|
|
|
|
|
using DS.WMS.Core.Sys.Interface;
|
|
|
|
|
using DS.WMS.Core.Sys.Method;
|
|
|
|
|
using Fasterflect;
|
|
|
|
|
using Mapster;
|
|
|
|
|
using Masuit.Tools.Systems;
|
|
|
|
@ -310,7 +308,6 @@ public class ClientInfoService : ServiceBase, IClientInfoService
|
|
|
|
|
InfoClient? client = clients.Find(x => x.ShortName == model.ShortName && x.Description == model.CNName);
|
|
|
|
|
if (client != null)
|
|
|
|
|
{
|
|
|
|
|
client.IsCustomer = model.IsCustomer;
|
|
|
|
|
client.IsSupplier = model.IsSupplier;
|
|
|
|
|
//client.Note = "系统导入";
|
|
|
|
|
existClients.Add(client);
|
|
|
|
@ -607,7 +604,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public async Task<DataResult<List<ClientUsage>>> GetUsageAsync(params long[] ids)
|
|
|
|
|
{
|
|
|
|
|
var list = await TenantDb.Queryable<InfoClient>().Where(x => ids.Contains(x.Id))
|
|
|
|
|
var list = await TenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>().Where(x => ids.Contains(x.Id))
|
|
|
|
|
.Select(c => new ClientUsage
|
|
|
|
|
{
|
|
|
|
|
Id = c.Id,
|
|
|
|
@ -658,7 +655,8 @@ public class ClientInfoService : ServiceBase, IClientInfoService
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
var model = await TenantDb.Queryable<InfoClient>().Where(x => x.Id == req.Id).Select(x => new
|
|
|
|
|
var model = await TenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>().Where(x => x.Id == req.Id)
|
|
|
|
|
.Select(x => new
|
|
|
|
|
{
|
|
|
|
|
x.Status,
|
|
|
|
|
x.AuditStatus
|
|
|
|
@ -725,7 +723,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public async Task<DataResult<ClientInfoRes>> GetAsync(string id)
|
|
|
|
|
{
|
|
|
|
|
var entity = await TenantDb.Queryable<InfoClient>()
|
|
|
|
|
var entity = await TenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>()
|
|
|
|
|
.Where(a => a.Id == long.Parse(id))
|
|
|
|
|
.FirstAsync();
|
|
|
|
|
if (entity == null)
|
|
|
|
|