Merge branch 'master' of http://36.137.93.232:3000/hf/Storage-Android-master

pages/store-in-manage/store-in/store-in.vue

@@ -118,9 +118,8 @@
 					rfidItems: this.scanList.map(item => item.rfidCode),
 					stockChangeType: this.stockChangeType,
 					remark: this.remark
-				}
+				} 
 				console.log(obj)
-				return
 				this.$http.HandleMacStockInOut(obj).then(res => {
 					console.log(res)
 					if(res.code === 0) {

pages/warehouse/reviewDtl.vue

@@ -193,7 +193,14 @@
 						}
 					}
 				}
-				console.log(rfidItems)
+				const obj = {
+					"userId": v.dtlData.stockBackId,
+					"plcCode": "1",
+					"rfidItems": rfidItems,
+					"stockChangeType": "16",
+					"remark": "退仓复合"
+				}
+
 				uni.request({
 					url: 'http://120.79.80.64:8050' + '/cloudApi/stockBack/submitCheck',
 					method: 'POST',
@@ -204,10 +211,21 @@
 					success: res => {
 						console.log(res)
 						if(res.data.code == 200){
+							this.$http.HandleMacStockInOut(obj).then(res => {
+								console.log(res)
+								if(res.code === 0) {
+									this.$msg.showToast(res.msg || '操作成功！')
+									this.timer = setTimeout(() => {
+										this.$utils.openNew(`/pages/warehouse/review`)
+									}, 2000)
+								}
+							})
 							
-							this.$utils.openNew(`/pages/warehouse/review`)
 						}
-					}, 
+						uni.hideLoading()
+					}, fail() {
+						uni.hideLoading()
+					}
 				});
 			},
 			tagFn(index,jindex){