From 7e36ea6c4312eebb1f2d10af8d96ac54b69d4b3b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 22 Dec 2022 15:45:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E9=A2=86?=
 =?UTF-8?q?=E7=94=A8=E6=89=AB=E7=A0=81=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/addDeviceCollectOrder.vue | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/inventory/addDeviceCollectOrder.vue b/src/views/inventory/addDeviceCollectOrder.vue
index 883acfc..36dc2f5 100644
--- a/src/views/inventory/addDeviceCollectOrder.vue
+++ b/src/views/inventory/addDeviceCollectOrder.vue
@@ -384,16 +384,7 @@ export default {
                 this.$message.error("请选择领用人！")
                 return;
             }
-            userInfo().then((res) => {
-                if (res.code === 20000) {
-                    if (!isBlank(res.data.locInvCode)) {
-                        this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
-                        this.getAllWarehouse();
-                        this.warehouseChange();
-                    }
-                }
-            }).catch((error) => {
-            });
+
             //保存或更新养护记录仓库信息
             this.saveOrder();
             this.filterQuery = {
@@ -406,6 +397,18 @@ export default {
                 page: 1,
                 limit: 10
             };
+
+            userInfo().then((res) => {
+                if (res.code === 20000) {
+                    if (!isBlank(res.data.locInvCode)) {
+                        this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                        this.getAllWarehouse();
+                        this.warehouseChange();
+                        this.queryInvProducts();
+                    }
+                }
+            }).catch((error) => {
+            });
             this.productList = [];
             this.productTotal = 0;
             this.selectInvProductVisible = true;
@@ -450,6 +453,12 @@ export default {
                 this.$message.warning("请先选择养护仓库！");
                 return;
             }
+
+            if (isBlank(this.formData.code)) {
+                this.$message.warning("请扫描或输入UDI码")
+                return;
+            }
+
             if (isBlank(this.formData.orderId)) {
                 this.saveOrder(this.formData.code);
                 return;