发料任务自动提交

src/mycomponents/scan/winComScan.vue

@@ -101,14 +101,14 @@
 		},
 		mounted() {
 			this.boxfocus =true;
-			uni.hideKeyboard();
+			// uni.hideKeyboard();
 			
 			// #ifdef H5
-			if (document.querySelector('textarea') != null) {
-				document.querySelector('textarea').setAttribute('inputmode', 'none')
-			}
+			// if (document.querySelector('textarea') != null) {
+			// 	document.querySelector('textarea').setAttribute('inputmode', 'none')
+			// }
 			// #endif 
-			this.hide()
+			// this.hide()
 			// #ifdef APP-PLUS
 			// 
 			// this.hide()

src/pages/issue/coms/comScanIssuePack.vue

@@ -122,6 +122,7 @@
 
 	export default {
 		name: 'winScanPack',
+		emits: ["afterScan"],
 		components: {
 			winComScan,
 			balance,
@@ -231,20 +232,12 @@
 				if (this.toLocation && result.package.packUnit) {
 					let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode);
 					if (result.package.packUnit !== item.packUnit) {
-						this.$refs.comMessage.showModal({
-							iconType:'警告',
-							content:`扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？`,
-							showConfirmButton:true,
-							showCancelButton:true,
-							confirmText:'是',
-							cancelText:'否',
-							success:({confirm})=>{
-								if(confirm){
+						this.$refs.comMessage.showQuestionMessage(
+							'扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？', res => {
+								if (res) {
 									this.onScanResult(result)
 								}
-							}
 							});
-						return
 					} else {
 						this.onScanResult(result)
 					}
@@ -340,6 +333,7 @@
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
 													that.getfocus();
+													return;
 												}
 											)
 										}
@@ -347,6 +341,7 @@
 								} else {
 									that.addRecord(batch, label, balance, packageInfo)
 								}
+								that.$emit("afterScan");
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
 									res => {
@@ -354,6 +349,7 @@
 									}
 								)
 							}
+
 						} else {
 							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
@@ -436,9 +432,6 @@
 
 			addRecord(batch, label, balance, packageInfo) {
 				let record = this.creatRecord(label, balance, packageInfo);
-				if(!batch.packingNumber){//解决发料任务删除的bug-wyf
-					batch.packingNumber = label.packingNumber
-				}
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
@@ -494,10 +487,12 @@
 							if (item != undefined) {
 
 								item.Locations.forEach(l => {
-									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b.batch == record.batch);
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
 
 									if (batch && batch.Records && batch.Records.length > 0) {
-										let rIndex = batch.Records.findIndex(r => r.packingNumber == record.packingNumber && r.batch == record.batch);
+										let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+											.packingNumber && r.batch == record.batch);
 										batch.Records.splice(rIndex, 1);
 									}
 

src/pages/issue/job/issueDetail.vue

@@ -34,7 +34,8 @@
 		</view>
 
 		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
-		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'
+			@afterScan='afterScan'>
 		</com-scan-issue-pack>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -243,7 +244,6 @@
 			// },
 
 			submit() {
-				
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -335,16 +335,15 @@
 											record.singlePrice = single_price;
 											record.amount = single_price * r.qty;
 
-											// //使用在途库不改变管理模式
-											// if (this.jobContent
-											// 	.useOnTheWayLocation ==
-											// 	'TRUE') {
-											// 	record.toPackingNumber = r
-											// 		.packingNumber;
-											// 	record.toBatch = r.batch;
-											// } else {
-												debugger
-												var info = getPackingNumberAndBatch(
+											//使用在途库不改变管理模式
+											if (this.jobContent
+												.useOnTheWayLocation == 'TRUE') {
+												record.toPackingNumber = r
+													.packingNumber;
+												record.toBatch = r.batch;
+											} else {
+												var info =
+													getPackingNumberAndBatch(
 														this.managementList, r
 														.itemCode,
 														r.packingNumber, r
@@ -352,7 +351,7 @@
 												record.toPackingNumber = info
 													.packingNumber;
 												record.toBatch = info.batch;
-											// }
+											}
 											subItem.recordList.push(record);
 										})
 										subList.push(subItem);
@@ -409,7 +408,8 @@
 
 				if (item != undefined) {
 					item.Locations.forEach(l => {
-						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b.packingNumber == null || b.packingNumber == '') && b.batch == record.batch);
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+							.packingNumber == null || b.packingNumber == '') && b.batch == record.batch);
 						let handleQty = 0;
 
 						if (batch != undefined) {
@@ -425,6 +425,31 @@
 				item.handleQty = itemHandleQty;
 			},
 
+			afterScan() {
+				this.detailSource.forEach(detail => {
+					let s = '';
+					detail.Items.forEach(item => {
+						let totalHandleQty = 0;
+						item.Locations.forEach(lco => {
+							lco.Batchs.forEach(batch => {
+								totalHandleQty = calc.add(totalHandleQty, batch.handleQty)
+							})
+						})
+						if (item.qty == totalHandleQty) {
+							this.submit();
+						} else {
+							this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty +
+								'】与物料需求数量【' + item.qty +
+								'】不一致，是否继续提交', res => {
+									if (res) {
+										this.submit();
+									}
+								});
+						}
+					})
+				})
+			},
+
 			scanPopupGetFocus() {
 				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.getfocus();

src/pages/repleinsh/job/repleinshDetail.vue

@@ -184,7 +184,10 @@
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.detailSource, that.subList)
+
+							setTimeout(r => {
 								that.resizeCollapse();
+							}, 100)
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -268,6 +271,7 @@
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
 
+				return;
 				repleinshJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
@@ -312,17 +316,20 @@
 												.toLocationCode;
 											record.supplierCode = r.supplierCode;
 
-											if(r.parentPackingNumber!=''&&r.parentPackingNumber!=null)
-											{
-												record.fromPackingNumber = r.parentPackingNumber;
+											if (r.parentPackingNumber != '' && r
+												.parentPackingNumber != null) {
+												record.fromPackingNumber = r
+													.parentPackingNumber;
 												record.toPackingNumber = r
 													.packingNumber;
-											}
-											else
-											{
-												record.fromPackingNumber = r.packingNumber;
+												// record.fromPackUnit = r.packUnit;
+												record.toPackUnit = r.packUnit;
+											} else {
+												record.fromPackingNumber = r
+													.packingNumber;
 												record.toPackingNumber = r
 													.packingNumber;
+												record.toPackUnit = r.packUnit;
 											}
 											record.toBatch = r.batch;