diff --git a/manifest.json b/manifest.json
index 90753dc..f9bfe12 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "干巷仓库APP",
     "appid" : "__UNI__A67E78B",
     "description" : "",
-    "versionName" : "2.1.9",
-    "versionCode" : 219,
+    "versionName" : "2.2.0",
+    "versionCode" : 220,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue
index f9f20ee..dd57fe3 100644
--- a/pages/inWarehouse/inWarehouse.vue
+++ b/pages/inWarehouse/inWarehouse.vue
@@ -142,7 +142,16 @@
 					this.searchType = 2;
 					this.warehouseInfo = data?.warehoseInfo;
 					this.newMaterialList = [];
+					this.loading = false;
 				} else if (type === 2) {
+					if(this.loading){
+						uni.showModal({
+							title: '提示',
+							content: '请等待加载完成!',
+							showCancel: false,
+							confirmText: '确定'
+						});
+					}
 					// 此时扫描的是箱号
 					// 当前录入的箱号是否在同一批次录入过
 					// 曾经是否扫过
@@ -155,6 +164,7 @@
 									showCancel: false,
 									confirmText: '确定'
 								});
+								this.loading = false;
 								return;
 							}
 						}
@@ -173,10 +183,14 @@
 						//严格模式
 						isStrict: this.isStrict
 					};
+					this.loading = true;
+					setTimeout(()=>{
+						this.loading = false;
+					},10000)
 					WarehoseApi.checkWarehousing(checkData).then((res) => {
 						if (res.code === 200 && res.data) {
-							console.log(data);
 							this.newMaterialList.push(data);
+							this.loading = false;
 						} else {
 							uni.showModal({
 								title: '提示',
@@ -184,6 +198,7 @@
 								showCancel: false,
 								confirmText: '确定'
 							});
+							this.loading = false;
 						}
 					});
 					// const checkData = {
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index d1d5416..f263329 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -32,7 +32,8 @@
 						<u-button type="primary" size="mini" @click="showChouseMaterial = true">选择物料号</u-button>
 					</template>
 				</u-input>
-				<u-popup :customStyle="{padding:'20px'}" :show="showChouseMaterial" @close="chouseMaterialClose" mode="center" closeable>
+				<u-popup :customStyle="{padding:'20px'}" :show="showChouseMaterial" @close="chouseMaterialClose"
+					mode="center" closeable>
 					<view>
 						<u-list width="300px" height="240px">
 							<u-list-item v-for="(item, index) in columns[0]" :key="index">
@@ -243,6 +244,14 @@
 					}
 
 				} else if (type === 2) {
+					if (this.loading) {
+						uni.showModal({
+							title: '提示',
+							content: '请等待加载完成!',
+							showCancel: false,
+							confirmText: '确定'
+						});
+					}
 					if (this.subsectionCurrent === 0 && this.newMaterialList.length > 0) {
 						uni.showModal({
 							title: '提示',
@@ -279,10 +288,15 @@
 						shipment_num: this.outInfo.shipmentNum,
 						partnumber: this.material_id
 					};
+					this.loading = true;
+					setTimeout(() => {
+						this.loading = false;
+					}, 10000)
 					//检查是否可以出货
 					WarehoseApi.checkProductionOut(checkData).then((res) => {
 						if (res.code === 200 && res.data) {
 							this.newMaterialList.push(data);
+							this.loading = false;
 						} else {
 							uni.showModal({
 								title: '提示',
@@ -290,6 +304,7 @@
 								showCancel: false,
 								confirmText: '确定'
 							});
+							this.loading = false;
 						}
 					});
 					// 此时扫描的是箱号
@@ -432,7 +447,7 @@
 									}
 								}
 							});
-						}else{
+						} else {
 							this.loading = false;
 						}
 					}
@@ -470,7 +485,7 @@
 									});
 								}
 							});
-						}else{
+						} else {
 							this.loading = false;
 						}
 					}