修改默认库位提示。预生产收货任务提示

src/pages/count/job/countDetail.vue

@@ -642,15 +642,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			getScanCount() {

src/pages/count/record/countRecord.vue

@@ -366,15 +366,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/customerReturn/job/returnDetail.vue

@@ -301,14 +301,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			commit() {
@@ -469,14 +467,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			showCommitSuccessMessage(hint) {

src/pages/customerReturn/record/returnRecord.vue

@@ -229,15 +229,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/customerReturn/request/customerReturnRequestCreate.vue

@@ -255,15 +255,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/deliver/record/deliverRecord.vue

@@ -231,16 +231,6 @@
 				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
 			},
 			
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-			},
 			showFromLocationPopup() {
 				this.$nextTick(() => {
 					this.$refs.scanLocationCode.openScanPopup();
@@ -260,15 +250,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/productDismantle/job/productDismantleDetail.vue

@@ -319,14 +319,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			commit() {

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -26,8 +26,8 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
-						@getLocation='scanLocationCode' 
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
@@ -314,13 +314,11 @@
 			},
 
 			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
-					// })
 				})
 			},
 

src/pages/productPutaway/record/productPutawayRecord.vue

@@ -220,15 +220,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/productReceipt/job/completeReceiveJobDetail.vue

@@ -255,14 +255,12 @@
 
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			checkLocation() {

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -275,14 +275,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				// })
 			},
 
 			checkLocation() {

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -72,6 +72,9 @@
 		calcHandleQty,
 		getScanCount
 	} from '@/common/detail.js';
+	import {
+		calc
+	} from '@/common/calc.js';
 
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
@@ -256,14 +259,12 @@
 
 
 			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				// })
 			},
 
 			checkLocation() {
@@ -300,12 +301,17 @@
 
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
+					if (this.checkCount()) {
 						this.submitJob();
+					}
+
 				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
+						if (this.checkCount()) {
 							this.submitJob();
+						}
 					} else {
 						//不允许部分提交，提示
 						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
@@ -316,6 +322,33 @@
 
 			},
 
+			checkCount() {
+				var isCheck = true;
+				var hint = ""
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					for (var j = 0; j < item.subList.length; j++) {
+						var subItem = item.subList[i]
+						if (calc.sub(subItem.handleQty, subItem.qty) < 0) {
+							isCheck = false;
+							hint = "包装【" + subItem.packingNumber + "】实际收货数量:" + subItem.handleQty + "与包装数量" + subItem.qty +
+								"不相等，是否继续收货?"
+							break
+						}
+					}
+				}
+				if (!isCheck) {
+					this.showQuestMessage(hint, res => {
+						if (res) {
+							this.submitJob();
+						}
+					})
+				}
+
+				return isCheck;
+
+			},
+
 			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
@@ -333,7 +366,7 @@
 						productReceiptJobsubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data, )
+								this.showCommitSuccessMessage("提交成功<br>生成预生产收货记录<br>" + res.data, )
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
@@ -411,6 +444,13 @@
 					navigateBack(1)
 				})
 			},
+			showQuestMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint, res => {
+					if (res) {
+						callBack(true)
+					}
+				})
+			},
 		}
 	}
 </script>

src/pages/productReceipt/job/scrapReceiptDetail.vue

@@ -255,14 +255,12 @@
 
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			checkLocation() {

src/pages/productReceipt/job/semiProductReceiptDetail.vue

@@ -255,14 +255,12 @@
 
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			checkLocation() {

src/pages/productionReceipt/job/productionReceiptDetail.vue

@@ -28,8 +28,8 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
-						@getLocation='scanLocationCode' 
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
@@ -475,14 +475,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				// })
 			},
 
 			showCommitSuccessMessage(hint) {

src/pages/productionReceipt/record/productionReceiptRecord.vue

@@ -213,15 +213,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/productionReturn/job/returnDetail.vue

@@ -322,14 +322,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			commit() {

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -348,14 +348,12 @@
 					}
 				}
 
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				// 	this.toLocationCode = code
 				// 	this.detailSource.forEach(item => {
 				// 		item.subList.forEach(detail => {
 				// 			detail.toLocationCode = code
 				// 		})
 				// 	})
-				// })
 			},
 
 			commit() {

src/pages/putaway/job/putawayDetail.vue

@@ -339,14 +339,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				// })
 			},
 
 			openDetail(item) {

src/pages/repleinsh/job/repleinshDetail.vue

@@ -481,10 +481,7 @@
 				this.updateCommitBtn();
 			},
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
-
-				})
 			},
 			getScanCount(subList) {
 				var scanCount = 0;

src/pages/stockUp/job/stockUpJobDetail.vue

@@ -216,14 +216,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.Items.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				// })
 			},
 
 			closeScan() {

src/pages/transfer/coms/comTransferRecord.vue

@@ -231,15 +231,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/transfer/job/issueDetail.vue

@@ -421,14 +421,12 @@
 			},
 			
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			showMessage(message) {

src/pages/transfer/job/receiptDetail.vue

@@ -458,14 +458,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 			showMessage(message) {

src/pages/transfer/record/deliverRecord.vue

@@ -218,15 +218,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/transfer/record/receiptRecord.vue

@@ -198,15 +198,12 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
-
 			},
 
 			commit() {

src/pages/unPlanned/job/receiptJobDetail.vue

@@ -181,18 +181,15 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = code
 					})
 				})
-				})
 			},
 
 
-
 			//继续扫描
 			continueScan() {
 				this.scanCount = getScanCount(this.subList);