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

导入代码修改

Browse Source
dev
嵇文龙 14 hours ago
parent 4a4aef380c
commit cd5890172a
6 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File

30
ds-wms-service/DS.WMS.Core/Fee/Method/FeeCustTemplateService.cs
Unescape Escape View File

@ -334,26 +334,19 @@ namespace DS.WMS.Core.Fee.Method
x.Code
}).ToListAsync();
//var portCodes = models.Select(x => x.POL).Union(models.Select(x => x.POD)).Distinct();
//var ports = await TenantDb.Queryable<CodePort>().Where(x => portCodes.Contains(x.EdiCode)).Select(x => new
//{
// x.Id,
// x.EdiCode
//}).ToListAsync();
var laneCodes = models.Select(x => x.LaneName).Distinct();
var lanes = await TenantDb.Queryable<CodeLanes>().Where(x => laneCodes.Contains(x.EdiCode)).Select(x => new
var lanes = await TenantDb.Queryable<CodeLanes>().Where(x => laneCodes.Contains(x.LaneName)).Select(x => new
{
x.Id,
x.EdiCode
x.LaneName
}).ToListAsync();
//var ptCodes = models.Select(x => x.PaymentType).Distinct();
//var frtList = await TenantDb.Queryable<CodeFrt>().Where(x => ptCodes.Contains(x.EdiCode)).Select(x => new
//{
// x.Id,
// x.EdiCode
//}).ToListAsync();
var ptCodes = models.Select(x => x.PaymentType).Distinct();
var frtList = await TenantDb.Queryable<CodeFrt>().Where(x => ptCodes.Contains(x.CnName)).Select(x => new
{
x.CnName,
x.FrtName
}).ToListAsync();
var sourceCodes = models.Select(x => x.SourceCode).Distinct();
var sources = await TenantDb.Queryable<CodeSource>().Where(x => sourceCodes.Contains(x.SourceCode)).Select(x => new
@ -369,7 +362,7 @@ namespace DS.WMS.Core.Fee.Method
var first = g.First();
FeeCustTemplate template = new FeeCustTemplate
{
Name = "导入费用模板" + groups.IndexOf(g),
Name = g.Key.SourceCode + "-" + "导入费用模板" + groups.IndexOf(g),
BusinessType = BusinessType.OceanShippingExport,
CustomerId = custList.Find(x => x.Name == g.Key.CustomerName)?.Id,
CustomerName = g.Key.CustomerName,
@ -380,8 +373,8 @@ namespace DS.WMS.Core.Fee.Method
IsShared = string.IsNullOrEmpty(g.Key.CustomerName),
Priority = 1,
CarrierId = carriers.Find(x => x.Code == g.Key.CarrierName)?.Id,
LaneId = lanes.Find(x => x.EdiCode == g.Key.LaneName)?.Id,
MBLFrtCode = g.Key.PaymentType,
LaneId = lanes.Find(x => x.LaneName == g.Key.LaneName)?.Id,
MBLFrtCode = frtList.Find(x => x.CnName == g.Key.PaymentType)?.FrtName,
POLCode = g.Key.POL,
PODCode = g.Key.POD,
SourceId = sources.Find(x => x.SourceCode == g.Key.SourceCode)?.Id,
@ -414,6 +407,7 @@ namespace DS.WMS.Core.Fee.Method
if (item.UnitPrice.HasValue)
{
detail.UnitPrice = detail.TaxUnitPrice = item.UnitPrice.Value;
detail.Unit = "P";
template.Details.Add(detail);
}

2
ds-wms-service/DS.WMS.Core/Info/Interface/IClientInfoService.cs
Unescape Escape View File

@ -87,7 +87,7 @@ public interface IClientInfoService
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<DataResult<ClientInfoRes>> GetAsync(string id);
Task<DataResult<ClientInfoRes>> GetAsync(long id);
/// <summary>
/// 批量删除发票抬头

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

@ -343,16 +343,25 @@ public class ClientInfoService : ServiceBase, IClientInfoService
ShortName = model.ShortName,
Description = model.CNName,
Tel = model.Tel,
IsOverdueDeduction = model.IsCustomer,
IsMortgageLastOrder = model.IsCustomer,
Note = "系统导入",
ClientTag = new InfoClientTag { IsController = model.IsCustomer },
AccountDates = []
};
var dicValues = dicList.FindAll(x => model.AttributeNames.Contains(x.Name));
foreach (var item in dicValues)
if (model.AttributeNames.Length == 0)
{
var dicValue = item.Value.ToUpperCamelCase();
PropertyExtensions.SetPropertyValue(client.ClientTag, dicValue, true);
client.ClientTag.IsOther = model.IsSupplier;
}
else
{
var dicValues = dicList.FindAll(x => model.AttributeNames.Contains(x.Name));
foreach (var item in dicValues)
{
var dicValue = item.Value.ToUpperCamelCase();
PropertyExtensions.SetPropertyValue(client.ClientTag, dicValue, true);
}
}
client.AccountDates.Add(new InfoClientAccountDate
@ -604,7 +613,8 @@ public class ClientInfoService : ServiceBase, IClientInfoService
/// <returns></returns>
public async Task<DataResult<List<ClientUsage>>> GetUsageAsync(params long[] ids)
{
var list = await TenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>().Where(x => ids.Contains(x.Id))
TenantDb.QueryFilter.Clear<ISharedOrgId>();
var list = await TenantDb.Queryable<InfoClient>().Where(x => ids.Contains(x.Id))
.Select(c => new ClientUsage
{
Id = c.Id,
@ -721,21 +731,16 @@ public class ClientInfoService : ServiceBase, IClientInfoService
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<DataResult<ClientInfoRes>> GetAsync(string id)
public async Task<DataResult<ClientInfoRes>> GetAsync(long id)
{
var entity = await TenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>()
.Where(a => a.Id == long.Parse(id))
.FirstAsync();
TenantDb.QueryFilter.Clear<ISharedOrgId>();
var entity = await TenantDb.Queryable<InfoClient>().Where(a => a.Id == id).FirstAsync();
if (entity == null)
return DataResult<ClientInfoRes>.Success(null);
var data = entity.Adapt<ClientInfoRes>();
data.ServiceItemCodes = entity.ServiceItem?.Split(',', StringSplitOptions.RemoveEmptyEntries);
var tag = await TenantDb.Queryable<InfoClientTag>().Select<ClientTagRes>()
.FirstAsync(a => a.ClientId == long.Parse(id));
data.ClientTag = tag;
data.ClientTag = await TenantDb.Queryable<InfoClientTag>().Select<ClientTagRes>().FirstAsync(a => a.ClientId == id);
data.InvoiceHeaders ??= await TenantDb.Queryable<InvoiceHeader>().Where(x => x.RelativeId == data.Id).ToListAsync();
return DataResult<ClientInfoRes>.Success(data, MultiLanguageConst.DataQuerySuccess);

3
ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCustTemplateController.cs
Unescape Escape View File

@ -81,6 +81,9 @@ namespace DS.WMS.FeeApi.Controllers
SourceCode = sourceCode
};
if (!string.IsNullOrEmpty(model.Currency))
model.Currency = model.Currency.Replace("CNY", FeeCurrency.RMB_CODE);
if (int.TryParse(item["H"]?.ToString(), out int hVal))
model.GP20 = hVal;

2
ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
Unescape Escape View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\Publish\DS8\FeeApi</_PublishTargetUrl>
<History>True|2024-10-21T06:30:54.4520206Z||;True|2024-10-21T10:19:05.7405749+08:00||;True|2024-10-18T16:11:05.4049685+08:00||;True|2024-10-18T14:59:49.1162741+08:00||;True|2024-10-16T16:29:15.3185348+08:00||;True|2024-10-16T14:12:58.1754214+08:00||;True|2024-10-16T14:08:06.5805581+08:00||;True|2024-10-16T11:55:29.8273176+08:00||;True|2024-10-15T17:39:40.4090324+08:00||;True|2024-10-15T17:06:43.0181578+08:00||;True|2024-10-15T15:07:38.9601925+08:00||;True|2024-10-12T13:33:32.4412583+08:00||;True|2024-10-11T17:00:54.0916209+08:00||;True|2024-10-11T10:54:50.3307087+08:00||;True|2024-10-11T10:45:07.8181500+08:00||;True|2024-10-11T10:40:44.2066046+08:00||;True|2024-10-11T10:21:25.7226983+08:00||;True|2024-10-11T10:09:05.5257478+08:00||;True|2024-10-10T14:58:29.1228618+08:00||;True|2024-10-10T14:05:59.4501659+08:00||;True|2024-10-10T11:08:58.9765455+08:00||;True|2024-10-08T17:59:07.5583287+08:00||;True|2024-09-27T19:01:59.6945760+08:00||;True|2024-09-27T18:45:48.2812860+08:00||;True|2024-09-27T18:10:25.5697467+08:00||;True|2024-09-27T17:39:06.3169139+08:00||;True|2024-09-27T17:30:14.1043193+08:00||;True|2024-09-27T16:02:09.0703159+08:00||;True|2024-09-27T15:53:05.1789245+08:00||;True|2024-09-27T15:32:52.1934490+08:00||;True|2024-09-27T13:51:24.9197626+08:00||;True|2024-09-27T13:48:17.2817346+08:00||;True|2024-09-27T11:51:46.8193040+08:00||;True|2024-09-27T10:58:33.1059648+08:00||;True|2024-09-27T10:37:35.0336563+08:00||;False|2024-09-27T10:31:52.6302264+08:00||;True|2024-09-26T19:50:15.5513195+08:00||;True|2024-09-26T19:47:14.0781788+08:00||;True|2024-09-26T19:01:26.5428388+08:00||;True|2024-09-26T18:35:28.7455319+08:00||;True|2024-09-26T18:24:30.8084807+08:00||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;</History>
<History>True|2024-10-21T09:57:21.7047579Z||;True|2024-10-21T14:30:54.4520206+08:00||;True|2024-10-21T10:19:05.7405749+08:00||;True|2024-10-18T16:11:05.4049685+08:00||;True|2024-10-18T14:59:49.1162741+08:00||;True|2024-10-16T16:29:15.3185348+08:00||;True|2024-10-16T14:12:58.1754214+08:00||;True|2024-10-16T14:08:06.5805581+08:00||;True|2024-10-16T11:55:29.8273176+08:00||;True|2024-10-15T17:39:40.4090324+08:00||;True|2024-10-15T17:06:43.0181578+08:00||;True|2024-10-15T15:07:38.9601925+08:00||;True|2024-10-12T13:33:32.4412583+08:00||;True|2024-10-11T17:00:54.0916209+08:00||;True|2024-10-11T10:54:50.3307087+08:00||;True|2024-10-11T10:45:07.8181500+08:00||;True|2024-10-11T10:40:44.2066046+08:00||;True|2024-10-11T10:21:25.7226983+08:00||;True|2024-10-11T10:09:05.5257478+08:00||;True|2024-10-10T14:58:29.1228618+08:00||;True|2024-10-10T14:05:59.4501659+08:00||;True|2024-10-10T11:08:58.9765455+08:00||;True|2024-10-08T17:59:07.5583287+08:00||;True|2024-09-27T19:01:59.6945760+08:00||;True|2024-09-27T18:45:48.2812860+08:00||;True|2024-09-27T18:10:25.5697467+08:00||;True|2024-09-27T17:39:06.3169139+08:00||;True|2024-09-27T17:30:14.1043193+08:00||;True|2024-09-27T16:02:09.0703159+08:00||;True|2024-09-27T15:53:05.1789245+08:00||;True|2024-09-27T15:32:52.1934490+08:00||;True|2024-09-27T13:51:24.9197626+08:00||;True|2024-09-27T13:48:17.2817346+08:00||;True|2024-09-27T11:51:46.8193040+08:00||;True|2024-09-27T10:58:33.1059648+08:00||;True|2024-09-27T10:37:35.0336563+08:00||;False|2024-09-27T10:31:52.6302264+08:00||;True|2024-09-26T19:50:15.5513195+08:00||;True|2024-09-26T19:47:14.0781788+08:00||;True|2024-09-26T19:01:26.5428388+08:00||;True|2024-09-26T18:35:28.7455319+08:00||;True|2024-09-26T18:24:30.8084807+08:00||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

2
ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs
Unescape Escape View File

@ -134,7 +134,7 @@ public class ClientInfoController : ApiController
/// <returns></returns>
[HttpGet]
[Route("GetClientInfo")]
public async Task<DataResult<ClientInfoRes>> GetClientInfoAsync([FromQuery] string id)
public async Task<DataResult<ClientInfoRes>> GetClientInfoAsync([FromQuery] long id)
{
return await _invokeService.GetAsync(id);
}

Write Preview
Loading…
Cancel
Save