Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/api/request2.js

@@ -4076,4 +4076,23 @@ export function overPageSubmit(params) {
 		method: "put",
 		data: params,
 	});
-}
+}
+
+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,
+	});
+}

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("提交成功<br>生成翻包记录<br>" + res.data)
+						this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>",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)
+						}
+						
+					})
 				})
 			},
 

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']