修改发料、补料扫描不是推荐批次

pages/deliver/record/deliverRecord.vue

@@ -121,7 +121,7 @@
 		},
 		onLoad(option) {
 
-			var typeCode = "DeliverRecord"
+			var typeCode = "Deliver"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;

pages/issue/coms/comScanIssuePack.vue

@@ -321,11 +321,15 @@
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发料明细,是否要继续发料?', res => {
 										if (res) {
 											let batch = that.createBatchInfo(label, balance,packageInfo);
+											//新增加的批次赋值details
+											if(fromLocation.Batchs.length>0){
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
 											fromLocation.Batchs.unshift(batch);
 										}
 									})

pages/issue/job/issueDetail.vue

@@ -277,7 +277,7 @@
 			},
 
 			setParams() {
-				var subList = []
+				var commitSubList = []
 				var createTime = getCurrDateTime();
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(toLocationCode => {
@@ -286,8 +286,8 @@
 							fromLocation.Batchs.forEach(batch => {
 								let subItem = batch.detail;
 								if(subItem!=undefined){
-									subItem.recordList = [];
 									if (batch.Records.length > 0) {
+										subItem.recordList = [];
 										batch.Records.forEach(r => {
 											let record = {};
 											record.handleQty = r.qty;
@@ -324,15 +324,14 @@
 											}
 											subItem.recordList.push(record);
 										})
-										subList.push(subItem);
+										commitSubList.push(subItem);
 									}
 								}
 							})
 						})
 					})
 				})
-
-				this.jobContent.subList = subList
+				this.jobContent.subList = commitSubList
 				this.jobContent.createTime = createTime;
 				this.jobContent.creator = creator;
 				return this.jobContent;

pages/repleinsh/coms/comScanReplishPack.vue

@@ -317,11 +317,14 @@
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发料明细,是否要继续发料?', res => {
 										if (res) {
 											let batch = that.createBatchInfo(label, balance,packageInfo);
+											if(fromLocation.Batchs.length>0){
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
 											fromLocation.Batchs.unshift(batch);
 										}
 									})

pages/repleinsh/job/repleinshDetail.vue

@@ -252,7 +252,7 @@
 			},
 
 			setParams() {
-				var subList = []
+				var commitSubList = []
 				var createTime = getCurrDateTime();
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(toLocationCode => {
@@ -260,52 +260,57 @@
 						item.Locations.forEach(fromLocation => {
 							fromLocation.Batchs.forEach(batch => {
 								let subItem = batch.detail;
-								subItem.recordList = [];
-								if (batch.Records.length > 0) {
-									batch.Records.forEach(r => {
-										let record = {};
-										record.handleQty = r.qty;
-
-										record.fromPackingNumber = r
-											.packingNumber;
-										record.fromBatch = r.batch;
-										record.fromContainerNumber = r
-											.ContainerNumber;
-
-										record.toContainerNumber = r
-											.ContainerNumber;
-										record.toInventoryStatus = r
-											.inventoryStatus;
-										record.toLocationCode = this
-											.toLocationCode;
-										record.supplierCode = r.supplierCode;
-
-										//使用在途库不改变管理模式
-										if (this.jobContent.useOnTheWayLocation ==
-											'TRUE') {
-											record.toPackingNumber = r
-												.packingNumber;
-											record.toBatch = r.batch;
-										} else {
-											var info = getPackingNumberAndBatch(
-												this.managementList, r
-												.itemCode,
-												r.packingNumber, r
-												.batch);
-											record.toPackingNumber = info
+
+								if (subItem != undefined) {
+									if (batch.Records.length > 0) {
+										subItem.recordList = [];
+										batch.Records.forEach(r => {
+											let record = {};
+											record.handleQty = r.qty;
+
+											record.fromPackingNumber = r
 												.packingNumber;
-											record.toBatch = info.batch;
-										}
-										subItem.recordList.push(record);
-									})
-									subList.push(subItem);
+											record.fromBatch = r.batch;
+											record.fromContainerNumber = r
+												.ContainerNumber;
+
+											record.toContainerNumber = r
+												.ContainerNumber;
+											record.toInventoryStatus = r
+												.inventoryStatus;
+											record.toLocationCode = this
+												.toLocationCode;
+											record.supplierCode = r.supplierCode;
+
+											//使用在途库不改变管理模式
+											if (this.jobContent
+												.useOnTheWayLocation ==
+												'TRUE') {
+												record.toPackingNumber = r
+													.packingNumber;
+												record.toBatch = r.batch;
+											} else {
+												var info =
+													getPackingNumberAndBatch(
+														this.managementList, r
+														.itemCode,
+														r.packingNumber, r
+														.batch);
+												record.toPackingNumber = info
+													.packingNumber;
+												record.toBatch = info.batch;
+											}
+											subItem.recordList.push(record);
+										})
+										commitSubList.push(subItem);
+									}
 								}
 							})
 						})
 					})
 				})
 
-				this.jobContent.subList = subList
+				this.jobContent.subList = commitSubList
 				this.jobContent.createTime = createTime;
 				this.jobContent.creator = creator;
 				return this.jobContent;