From 220ba45e18269cfdde4a094d3919663dd6939820 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 10 May 2024 13:09:41 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/request2.js | 21 +++++-
.../package/job/overPackageJobDetail.vue | 37 ++++++++--
src/pages/point/index.vue | 69 ++++++++++---------
3 files changed, 89 insertions(+), 38 deletions(-)
diff --git a/src/api/request2.js b/src/api/request2.js
index 720170cb..44430cd5 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4076,4 +4076,23 @@ export function overPageSubmit(params) {
method: "put",
data: params,
});
-}
\ No newline at end of file
+}
+
+export function getPackageLabel(packageCode) {
+ var params = {
+ name: name,
+ pageNo: 1,
+ pageSize: 10,
+ sort:"",
+ filters:[{
+ action: "==",
+ column:"relateNumber",
+ value: packageCode
+ }]
+ }
+ return request({
+ url: baseApi + "/wms/barbasic/senior",
+ method: "post",
+ data: params,
+ });
+}
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index ffa515e9..22a57698 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -59,7 +59,8 @@
takeOverPageJob,
cancleTakeOverPageJob,
getOverPageJobDetail,
- overPageSubmit
+ overPageSubmit,
+ getPackageLabel
} from '@/api/request2.js';
import {
@@ -328,7 +329,17 @@
overPageSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成翻包记录
" + res.data)
+ this.showCommitSuccessMessage("提交成功
生成翻包记录
",res.data.map(item=>({
+ itemNumber: item.itemCode, // 物品代码
+ itemName: item.itemName, // 物品名称
+ referenceOrderRow: item.poLine, // 订单行
+ referenceOrderCode: item.poNumber, // 订单号
+ supplierCode: item.supplierCode, // 供应商
+ packageCode: item.number, // 包装号
+ amount: item.qty, // 数量
+ barcodeString: '', // 标签信息
+ barcodeBase64: ''
+ })))
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -508,9 +519,25 @@
this.$refs.comMessage.showCommitSuccess();
},
- showCommitSuccessMessage(hint) {
- this.$refs.comMessage.showSuccessMessage(hint, res => {
- navigateBack(1)
+ showCommitSuccessMessage(hint,pointData) {
+ Promise.all(pointData.map(item=>{
+ return getPackageLabel(item.packageCode)
+ })).then(res=>{
+ res.forEach(item=>{
+ const point = pointData.find(pointItem=>pointItem.packageCode==item.data.list[0].relateNumber)
+ point.barcodeString = item.data.list[0].barcodeString
+ })
+ this.$refs.comMessage.showSuccessMessage(hint, res => {
+
+ if(pointData.length>0){
+ uni.navigateTo({
+ url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+ });
+ }else{
+ navigateBack(1)
+ }
+
+ })
})
},
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 87236005..2bea1449 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -57,6 +57,7 @@
// #endif
export default {
+ name: 'point',
data() {
return {
data: {},
@@ -143,40 +144,44 @@
}
}
},
-
+ onLoad(option) {
+ if (option.points) {
+ this.data = JSON.parse(option.points);
+ }
+ },
async onShow() {
// 获取数据
- this.data = [{
- itemNumber: '555555',
- itemName: 'hahah',
- referenceOrderRow: '55',
- referenceOrderCode: '55',
- supplierCode: '555',
- packageCode: '9999-8888',
- amount: '55',
- barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
- barcodeBase64: ''
- }, {
- itemNumber: '66',
- itemName: 'hahah',
- referenceOrderRow: '66',
- referenceOrderCode: '666',
- supplierCode: '66',
- packageCode: '66666',
- amount: '666666',
- barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
- barcodeBase64: ''
- }, {
- itemNumber: '66',
- itemName: 'hahah',
- referenceOrderRow: '66',
- referenceOrderCode: '666',
- supplierCode: '66',
- packageCode: '66666',
- amount: '666666',
- barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;',
- barcodeBase64: ''
- }]
+ // this.data = [{
+ // itemNumber: '555555',
+ // itemName: 'hahah',
+ // referenceOrderRow: '55',
+ // referenceOrderCode: '55',
+ // supplierCode: '555',
+ // packageCode: '9999-8888',
+ // amount: '55',
+ // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
+ // barcodeBase64: ''
+ // }, {
+ // itemNumber: '66',
+ // itemName: 'hahah',
+ // referenceOrderRow: '66',
+ // referenceOrderCode: '666',
+ // supplierCode: '66',
+ // packageCode: '66666',
+ // amount: '666666',
+ // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
+ // barcodeBase64: ''
+ // }, {
+ // itemNumber: '66',
+ // itemName: 'hahah',
+ // referenceOrderRow: '66',
+ // referenceOrderCode: '666',
+ // supplierCode: '66',
+ // packageCode: '66666',
+ // amount: '666666',
+ // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;',
+ // barcodeBase64: ''
+ // }]
this.$nextTick(async () => {
// 获取二维码图片临时路径
const el = this.$refs['qrcodeRef']