Merge branch 'master' of http://svn.2fi-solutions.com:8300/derek/FPSMS-frontend

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');
   }