From 0dcb453cc980599067db3c749b0311169fc41f3b Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Fri, 21 Nov 2025 11:21:41 +0800
Subject: [PATCH] fix

---
 src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
index c462dba..55eed14 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
@@ -189,14 +189,8 @@ const validateForm = (): boolean => {
     newErrors.actualPickQty = t('Qty cannot be negative');
   }
   
-<<<<<<< HEAD
   // 2. 检查 actualPickQty 不能超过可用数量或需求数量
   if (ap > Math.min(req)) {
-=======
-
-
-  if (ap > Math.min( req)) {
->>>>>>> 129d67d30ab8a0996700d8fe19644e25a5fe0471
     newErrors.actualPickQty = t('Qty is not allowed to be greater than required/available qty');
   }