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;