翻包打印

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("提交成功<br>生成翻包记录<br>", list)

src/pages/package/record/overPackageRecord.vue

@@ -342,7 +342,25 @@
 				overPackageRecordSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>" + 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("提交成功<br>生成翻包记录<br>" + 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)}`
+						});
+					}
 
 				})
 			},

src/pages/point/index.vue

@@ -5,36 +5,53 @@
 			<view class="left">
 				<view class="left-item">
 					<view class="label">物品代码</view>
-					<view class="value" id="name1">{{item.itemNumber}}</view>
+					<view class="value" id="name1">{{item.itemCode}}</view>
 				</view>
 				<view class="left-item">
 					<view class="label">物品名称</view>
 					<view class="value" id="name2">{{item.itemName}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">供应商</view>
-					<view class="value">{{item.supplierCode}}</view>
+					<view class="label">包装名称</view>
+					<view class="value">{{item.packName}}</view>
 				</view>
 				<view class="left-item">
 					<view class="label">包装号</view>
 					<view class="value">{{item.packageCode}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">订单行</view>
-					<view class="value">{{item.referenceOrderRow}}</view>
+					<view class="label">父包装号</view>
+					<view class="value">{{item.parentNumber}}</view>
+				</view>
+				<view class="left-item">
+					<view class="label">ASN</view>
+					<view class="value">{{item.asnNumber}}</view>
+				</view>
+				<view class="left-item">
+					<view class="label">数量</view>
+					<view class="value">{{item.qty}}</view>
 				</view>
+				
 			</view>
 			<view class="right">
 				<view class="image">
 					<l-qrcode ref="qrcodeRef" :value="item.barcodeString" size="300rpx"></l-qrcode>
 				</view>
 				<view class="left-item">
-					<view class="label">订单号</view>
-					<view class="value">{{item.referenceOrderCode}}</view>
+					<view class="label">批次</view>
+					<view class="value">{{item.batch}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">数量</view>
-					<view class="value">{{item.amount}}</view>
+					<view class="label">物料类型</view>
+					<view class="value">{{item.itemType}}</view>
+				</view>
+				<view class="left-item">
+					<view class="label">供应商</view>
+					<view class="value">{{item.supplierCode}}</view>
+				</view>
+				<view class="left-item">
+					<view class="label">打印时间</view>
+					<view class="value">{{item.printTimes}}</view>
 				</view>
 			</view>
 		</view>
@@ -102,23 +119,31 @@
 										<div class="left">
 											<div class="left-item">
 												<div class="label">物品代码</div>
-												<div class="value" id="name1">${item.itemNumber}</div>
+												<div class="value" id="name1">${item.itemCode}</div>
 											</div>
 											<div class="left-item">
 												<div class="label">物品名称</div>
 												<div class="value" id="name2">${item.itemName}</div>
 											</div>
 											<div class="left-item">
-												<div class="label">供应商</div>
-												<div class="value">${item.supplierCode}</div>
+												<div class="label">包装名称</div>
+												<div class="value">${item.packName}</div>
 											</div>
 											<div class="left-item">
 												<div class="label">包装号</div>
 												<div class="value">${item.packageCode}</div>
 											</div>
 											<div class="left-item">
-												<div class="label">订单行</div>
-												<div class="value">${item.referenceOrderRow}</div>
+												<div class="label">父包装号</div>
+												<div class="value">${item.parentNumber}</div>
+											</div>
+											<div class="left-item">
+												<div class="label">ASN</div>
+												<div class="value">${item.asnNumber}</div>
+											</div>
+											<div class="left-item">
+												<div class="label">数量</div>
+												<div class="value">${item.qty}</div>
 											</div>
 										</div>
 										<div class="right">
@@ -126,12 +151,20 @@
 												<img id='image1' src="${item.barcodeBase64}" alt="" />
 											</div>
 											<div class="left-item">
-												<div class="label">订单号</div>
-												<div class="value">${item.referenceOrderRow}</div>
+												<div class="label">批次</div>
+												<div class="value">${item.batch}</div>
 											</div>
 											<div class="left-item">
-												<div class="label">数量</div>
-												<div class="value">${item.amount}</div>
+												<div class="label">物料类型</div>
+												<div class="value">${item.itemType}</div>
+											</div>
+											<div class="left-item">
+												<div class="label">供应商</div>
+												<div class="value">${item.supplierCode}</div>
+											</div>
+											<div class="left-item">
+												<div class="label">打印时间</div>
+												<div class="value">${item.printTimes}</div>
 											</div>
 										</div>
 									</div>`