From ecf60bb0cd5a04ce38120302be4cf55fd3c3a27b Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期二, 04 四月 2023 16:23:38 +0800
Subject: [PATCH] 返品限制条件验证

---
 force-app/main/default/classes/ArriveGoodsController.cls |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index d9c445a..cb91f3b 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -885,6 +885,8 @@
                         WHERE Dealer_Arrive__c = FALSE 
                         AND  Dealer_Shipment__c= FALSE
                         AND  Dealer_Saled__c = FALSE
+                        // gzw fix 鍙栨秷浜у搧鍒ゆ柇涓烘湭鍏ュ簱 20230323
+                        AND Cancellation_Flag__c = false
                         AND  Dealer_Returned__c = false
                         AND  Bar_Code__c in :BarCodeListP
                         AND Dealer_Info_text__c = :accountName

--
Gitblit v1.9.1