diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs index 19f690a..f7d2c5d 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs @@ -141,7 +141,7 @@ namespace Win_in.Sfs.Scp.WebApi UID = asn.Id, Company = asn.Site, Site = asn.Site, - AsnNbr = asn.AskBillNum, + AsnNbr = asn.AsnBillNum, RpNbr = asn.AskBillNum, PoNbr = asn.PoBillNum, VendorCode = asn.VendId, diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Asns/IX12AsnAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Asns/IX12AsnAppService.cs index 751ca87..4a0f9a8 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Asns/IX12AsnAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Asns/IX12AsnAppService.cs @@ -30,7 +30,7 @@ namespace Win_in.Sfs.Scp.WebApi Task> GetAsync(string site, string number); - Task> UpdateStatusAsync(string site, string number, EnumExchangeDataStatus status); + Task> UpdateStatusAsync(string site, string number,string dataType, EnumExchangeDataStatus status); } diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs index f7ea1be..e63b3f3 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs @@ -382,6 +382,7 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 地点(Site) /// 单据编号(Asn number) + /// 数据类型(data type:"ASN","NoPoASN" /// 状态(Status) /// 0: 新增(new) /// 1: 处理中(Processing) @@ -393,7 +394,7 @@ namespace Win_in.Sfs.Scp.WebApi /// [HttpPost] [Route("update-status")] - public async Task> UpdateStatusAsync(string site, string number, EnumExchangeDataStatus status) + public async Task> UpdateStatusAsync(string site, string number,string dataType, EnumExchangeDataStatus status) { X12Asn entity; try @@ -401,7 +402,7 @@ namespace Win_in.Sfs.Scp.WebApi Validator.CheckSite(_tenantRepository, site); - entity = await _x12AsnRepository.FirstOrDefaultAsync(p => p.Site == site && p.BillNum == number); + entity = await _x12AsnRepository.FirstOrDefaultAsync(p => p.Site == site &&p.DataType ==dataType && p.BillNum == number); if (entity == null) {