From 67f9dd314dc308e916906c44ef67093e0b2ccbcc Mon Sep 17 00:00:00 2001
From: "rongguo.jia" <rongguo.jia@ccwin-in.com>
Date: Thu, 3 Nov 2022 15:00:40 +0800
Subject: [PATCH] =?UTF-8?q?[fix]bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsnBackgroundWorker/AsnBackgroundWorker.cs               | 2 +-
 .../Asns/IX12AsnAppService.cs                                | 2 +-
 .../Asns/X12AsnAppService.cs                                 | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

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<ActionResult<X12AsnDTO>> GetAsync(string site, string number);
 
-        Task<ActionResult<X12AsnDTO>> UpdateStatusAsync(string site, string number, EnumExchangeDataStatus status);
+        Task<ActionResult<X12AsnDTO>> 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
         /// </summary>
         /// <param name="site">地点(Site)</param>
         /// <param name="number">单据编号(Asn number)</param>
+        /// <param name="dataType">数据类型(data type:"ASN","NoPoASN"</param>
         /// <param name="status">状态(Status)
         ///     0: 新增(new)
         ///     1: 处理中(Processing)
@@ -393,7 +394,7 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <exception cref="BadHttpRequestException"></exception>
         [HttpPost]
         [Route("update-status")]
-        public async Task<ActionResult<X12AsnDTO>> UpdateStatusAsync(string site, string number, EnumExchangeDataStatus status)
+        public async Task<ActionResult<X12AsnDTO>> 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)
                 {