From 2828c983295490131385b3bf3f24effb1aad9b58 Mon Sep 17 00:00:00 2001
From: liuyunfeng <yunfeng.liu@ccwin-in.com>
Date: Mon, 1 Jul 2024 16:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug-=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E5=90=8E=E9=80=80=E8=B4=A7--=E4=B8=8A=E6=9E=B6=E5=90=8E?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=8F=90=E4=BA=A4=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseReturnRequests/PurchaseReturnRequestManager.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs
index 68a317fcd..eaae9b4c0 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs
@@ -24,7 +24,9 @@ public class PurchaseReturnRequestManager : SfsStoreRequestManagerBase<PurchaseR
 
         foreach (var entity in entities)
         {
-            var lst = await Repository.GetPagedListAsync(itm => itm.PoNumber == entity.PoNumber && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false);
+            var lst = await Repository.GetPagedListAsync(itm => itm.PoNumber == entity.PoNumber
+                && (itm.RequestStatus != EnumRequestStatus.Refused && itm.RequestStatus != EnumRequestStatus.Cancelled && itm.RequestStatus != EnumRequestStatus.Abort)
+                && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false);
             if (lst.Count > 0)
             {
                 throw new UserFriendlyException($"采购退货申请的订单号{entity.PoNumber}、箱码{entity.Details[0].PackingCode}重复");