修改装配完工收货校验

src/api/request2.js

@@ -4137,3 +4137,15 @@ export function getPackageLabel(packageCode) {
 		data: params,
 	});
 }
+
+/**
+ * 装配收货mes码是否已经完工
+ * @param {*}  
+ */
+export function isCheckMesCode(code) {
+	return request({
+		url: baseApi + "/wms/productreceipt-detailb/getCheckWhetherItExists?remark="+code,
+		method: "get",
+		data: {},
+	});
+}

src/mycomponents/scan/winComScanFg.vue

@@ -197,8 +197,10 @@
 								let batch = content.substr(lengthMat + 8, 3);
 								let order = content.substr(-8);
 								if (itemCode != partNumber) {
+									that.clear();
 									throw new Error("解析错误:扫描物料号【" + itemCode + "】与查询物料号【" + partNumber +
 										"】不一致")
+										
 								}
 
 								let scanResult = {

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -78,7 +78,8 @@
 		productReceiptJobsubmit,
 		getPrintProductReceiptList,
 		getBalanceToPackage,
-		batchPrintingLable
+		batchPrintingLable,
+		isCheckMesCode
 	} from '@/api/request2.js';
 	import {
 		goHome,
@@ -245,8 +246,11 @@
 			},
 
 			getScanResult(result) {
-				//TODO缺少零件号的对应关系
 					let that = this;
+				//TODO缺少零件号的对应关系
+				//查询mes码是否完工
+				isCheckMesCode(result.content).then(res=>{
+					if(res.data){
 						if (that.detailSource.length > 0) {
 							let item = that.detailSource[0]; //应该按零件号查找
 							result.uom = item.uom;
@@ -281,6 +285,11 @@
 								}, 500)
 							}
 						}
+					}
+				}).catch(error=>{
+					this.showErrorMessage(error)
+				})
+				
 			},
 
 			calcFgQty() {
@@ -448,7 +457,9 @@
 								}
 							}
 						}else {
+							if(!subitem.handleQty){
 								subitem.handleQty=subitem.qty
+							}
 							subitem.scaned = true
 							this.submitJob();
 						}
@@ -508,7 +519,6 @@
 									res.outsideItemCode = res.itemCode
 									res.outsideProduceDate = res.productDate
 									res.outsideSerialNumber = res.order
-									res.lowerLim=res.content
 								})
 							}else {
 								detail.fgList=[]