修改直接发料扫描父子包装问题

src/pages/issue/record/directIssue.vue

@@ -243,15 +243,74 @@
 						}
 					})
 					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						newDetail.parentNumber = pack.parentNumber;
-						newDetail.packingNumber = pack.number
-						newDetail.packUnit = pack.packUnit;
-						newDetail.packQty = pack.packQty;
-						if (balance.lableQty) {
-							newDetail.handleQty = balance.lableQty
+						//如果最开始扫父，在扫子，提示已经扫描父包装
+						//如果扫子在扫父，提示扫描的是父包装，是否移除子包装，是移除子包装，显示父包装
+						//扫描的是子包装,
+						if (pack.parentNumber) {
+							var checkData = item.subList.find(r => {
+								if (r.packingNumber == pack.parentNumber &&
+									r.batch == balance.batch) {
+									return r;
+								}
+							})
+							if (checkData) {
+								//提示已经扫描
+								this.showErrorMessage("箱码[" + pack.number + "]批次[" + balance.batch +
+									"]的父包装已经扫描")
+								console.log("父包装已经扫描")
+							} else {
+								let newDetail = createDetailInfo(balance, pack);
+								newDetail.parentNumber = pack.parentNumber;
+								newDetail.packingNumber = pack.number
+								newDetail.packUnit = pack.packUnit;
+								newDetail.packQty = pack.packQty;
+								if (balance.lableQty) {
+									newDetail.handleQty = balance.lableQty
+								}
+								item.subList.push(newDetail);
+							}
+
+						} else {
+							//扫描的是父包装
+							var checkData = item.subList.find(r => {
+								if (r.parentNumber == pack.number &&
+									r.batch == balance.batch) {
+									return r;
+								}
+							})
+							if (checkData) {
+								//是否移除
+								this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance
+									.batch + "]是父包装，是否移除子包装", res => {
+										if (res) {
+											item.subList = [];
+											let newDetail = createDetailInfo(balance, pack);
+											newDetail.parentNumber = pack.parentNumber;
+											newDetail.packingNumber = pack.number
+											newDetail.packUnit = pack.packUnit;
+											newDetail.packQty = pack.packQty;
+											if (balance.lableQty) {
+												newDetail.handleQty = balance.lableQty
+											}
+											item.subList.push(newDetail);
+										}
+									})
+								console.log("扫描的是父包装，是否移除子包装")
+							} else {
+								let newDetail = createDetailInfo(balance, pack);
+								newDetail.parentNumber = pack.parentNumber;
+								newDetail.packingNumber = pack.number
+								newDetail.packUnit = pack.packUnit;
+								newDetail.packQty = pack.packQty;
+								if (balance.lableQty) {
+									newDetail.handleQty = balance.lableQty
+								}
+								item.subList.push(newDetail);
+							}
+
 						}
-						item.subList.push(newDetail);
+
+
 						this.scanPopupGetFocus()
 					} else {
 						if (detail.scaned == true) {
@@ -386,7 +445,7 @@
 			// },
 
 			commit() {
-				if(this.positionInfo=='请选择生产线'||!this.positionInfo){
+				if (this.positionInfo == '请选择生产线' || !this.positionInfo) {
 					this.showErrorMessage("请选择生产线")
 					return
 				}

src/pages/repleinsh/record/directRepleinshRecord.vue

@@ -267,15 +267,70 @@
 						}
 					})
 					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						newDetail.parentNumber = pack.parentNumber;
-						newDetail.packingNumber = pack.number
-						newDetail.packUnit = pack.packUnit;
-						newDetail.packQty = pack.packQty;
-						if (balance.lableQty) {
-							newDetail.handleQty = balance.lableQty
+						//如果最开始扫父，在扫子，提示已经扫描父包装
+						//如果扫子在扫父，提示扫描的是父包装，是否移除子包装，是移除子包装，显示父包装
+						//扫描的是子包装,
+						if (pack.parentNumber) {
+							var checkData = item.subList.find(r => {
+								if (r.packingNumber == pack.parentNumber &&
+									r.batch == balance.batch) {
+									return r;
+								}
+							})
+							if (checkData) {
+								//提示已经扫描
+								this.showErrorMessage("箱码[" + pack.number + "]批次[" + balance.batch +
+									"]的父包装已经扫描")
+								console.log("父包装已经扫描")
+							} else {
+								let newDetail = createDetailInfo(balance, pack);
+								newDetail.parentNumber = pack.parentNumber;
+								newDetail.packingNumber = pack.number
+								newDetail.packUnit = pack.packUnit;
+								newDetail.packQty = pack.packQty;
+								if (balance.lableQty) {
+									newDetail.handleQty = balance.lableQty
+								}
+								item.subList.push(newDetail);
+							}
+						} else {
+							//扫描的是父包装
+							var checkData = item.subList.find(r => {
+								if (r.parentNumber == pack.number &&
+									r.batch == balance.batch) {
+									return r;
+								}
+							})
+							if (checkData) {
+								//是否移除
+								this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance
+									.batch + "]是父包装，是否移除子包装", res => {
+										if (res) {
+											item.subList = [];
+											let newDetail = createDetailInfo(balance, pack);
+											newDetail.parentNumber = pack.parentNumber;
+											newDetail.packingNumber = pack.number
+											newDetail.packUnit = pack.packUnit;
+											newDetail.packQty = pack.packQty;
+											if (balance.lableQty) {
+												newDetail.handleQty = balance.lableQty
+											}
+											item.subList.push(newDetail);
+										}
+									})
+								console.log("扫描的是父包装，是否移除子包装")
+							} else {
+								let newDetail = createDetailInfo(balance, pack);
+								newDetail.parentNumber = pack.parentNumber;
+								newDetail.packingNumber = pack.number
+								newDetail.packUnit = pack.packUnit;
+								newDetail.packQty = pack.packQty;
+								if (balance.lableQty) {
+									newDetail.handleQty = balance.lableQty
+								}
+								item.subList.push(newDetail);
+							}
 						}
-						item.subList.push(newDetail);
 						this.scanPopupGetFocus()
 					} else {
 						if (detail.scaned == true) {