Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue

@@ -1007,18 +1007,7 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
 
 const stockamount = ref(false)
 const saveFormData = async (active, status, type) => {
-  stockamount.value = false
+ 
-  if (formData.value.matItemDOList.length > 0) {
-    formData.value.matItemDOList.forEach((item) => {
-      if (item.stockQuantity < item.storageOkQty) {
-        stockamount.value = true
-      }
-    })
-  }
-  if (stockamount.value) {
-    message.alertWarning('领料数量不能大于库存数量')
-    return
-  }
   if (active === 'SUBMIT') {
     //提示
     if (formData.value.matItemDOList.length === 0) {
@@ -1129,6 +1118,18 @@ const saveFormData = async (active, status, type) => {
 }
 
 const saveFormDataSUBMIT = (active, status) => {
+  stockamount.value = false
+  if (formData.value.matItemDOList.length > 0) {
+    formData.value.matItemDOList.forEach((item) => {
+      if (item.stockQuantity < item.storageOkQty) {
+        stockamount.value = true
+      }
+    })
+  }
+  if (stockamount.value) {
+    message.alertWarning('领料数量不能大于库存数量')
+    return
+  }
   setTimeout(async () => {
     //提交
     formData.value.active = active