diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 324c66c1..2cb32dd4 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -332,15 +332,19 @@ let list = []; res.data.forEach(item => { list.push({ - itemNumber: item.itemCode, // 物品代码 + itemCode:item.itemCode, // 物品代码 itemName: item.itemName, // 物品名称 - referenceOrderRow: item.poLine, // 订单行 - referenceOrderCode: item.poNumber, // 订单号 - supplierCode: item.supplierCode, // 供应商 + packName: item.packName,// 包装名称 packageCode: item.number, // 包装号 - amount: item.qty, // 数量 + batch:item.batch,//批次 + parentNumber:item.parentNumber,//父包装号 + itemType:item.itemType,//物料类型 + asnNumber:item.asnNumber,//ASN + supplierCode: item.supplierCode, // 供应商 + qty: item.qty, // 数量 + printTimes:getCurrDateTime(), // 打印时间 barcodeString: item.barcodeString, // 标签信息 - barcodeBase64: '' + barcodeBase64: '', }) }) this.showCommitSuccessMessage("提交成功
生成翻包记录
", list) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 7bd7be06..42ce7591 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -342,7 +342,25 @@ overPackageRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成翻包记录
" + res.data) + let list = []; + res.data.forEach(item => { + list.push({ + itemCode:item.itemCode, // 物品代码 + itemName: item.itemName, // 物品名称 + packName: item.packName,// 包装名称 + packageCode: item.toPackingNumber, // 包装号 + batch:item.batch,//批次 + parentNumber:item.parentNumber,//父包装号 + itemType: item.itemType,//物料类型 + asnNumber:item.asnNumber,//ASN + supplierCode: item.supplierCode, // 供应商 + qty: item.qty, // 数量 + printTimes:item.printTimes, // 打印时间 + barcodeString: item.barcodeString, // 标签信息 + barcodeBase64: '', + }) + }) + this.showCommitSuccessMessage("提交成功
生成翻包记录
" + list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -414,12 +432,18 @@ this.fromLocationCode = code; this.openScanPopup(); }, + - showCommitSuccessMessage(hint) { + showCommitSuccessMessage(hint,pointData) { this.$refs.comMessage.showSuccessMessage(hint, res => { this.detailSource = [] this.fromLocationCode = ''; this.dataContent = {} + if (pointData.length > 0) { + uni.navigateTo({ + url: `/pages/point/index?points=${JSON.stringify(pointData)}` + }); + } }) }, diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 2bea1449..62bbe201 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -5,36 +5,53 @@ 物品代码 - {{item.itemNumber}} + {{item.itemCode}} 物品名称 {{item.itemName}} - 供应商 - {{item.supplierCode}} + 包装名称 + {{item.packName}} 包装号 {{item.packageCode}} - 订单行 - {{item.referenceOrderRow}} + 父包装号 + {{item.parentNumber}} + + + ASN + {{item.asnNumber}} + + + 数量 + {{item.qty}} + - 订单号 - {{item.referenceOrderCode}} + 批次 + {{item.batch}} - 数量 - {{item.amount}} + 物料类型 + {{item.itemType}} + + + 供应商 + {{item.supplierCode}} + + + 打印时间 + {{item.printTimes}} @@ -102,23 +119,31 @@
物品代码
-
${item.itemNumber}
+
${item.itemCode}
物品名称
${item.itemName}
-
供应商
-
${item.supplierCode}
+
包装名称
+
${item.packName}
包装号
${item.packageCode}
-
订单行
-
${item.referenceOrderRow}
+
父包装号
+
${item.parentNumber}
+
+
+
ASN
+
${item.asnNumber}
+
+
+
数量
+
${item.qty}
@@ -126,12 +151,20 @@
-
订单号
-
${item.referenceOrderRow}
+
批次
+
${item.batch}
-
数量
-
${item.amount}
+
物料类型
+
${item.itemType}
+
+
+
供应商
+
${item.supplierCode}
+
+
+
打印时间
+
${item.printTimes}
`