diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
index e6f2499..c462dba 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
@@ -189,9 +189,14 @@ 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');
   }