From c7d93b865c6b53d6c79587caf32ec3aa97929868 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 28 Aug 2024 18:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BB=A3=E7=A0=812024/6/12?=
 =?UTF-8?q?=2018:26:48?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/job/deliverDetail.vue       |  4 +-
 src/pages/issue/request/issueScanRequest.vue  |  1 +
 .../package/record/overPackageRecord.vue      | 28 ++++++-
 src/pages/point/index.vue                     | 76 +++++++++++++------
 4 files changed, 84 insertions(+), 25 deletions(-)

diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index eb9af1da..fa570e32 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -201,7 +201,9 @@ const submit = () => {
 }
 const submitJob = () => {
   const params = setParams()
-
+  if (params.subList.length == 0) {
+    comMessageRef.value.showSuccessMessage('请扫描箱码')
+  }
   deliverJobSubmit(params)
     .then((res) => {
       uni.hideLoading()
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index e0bf3621..f27e916e 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -85,6 +85,7 @@ const getScanResult = (data) => {
 
 const setParams = () => {
   detailSource.value.dueTime = getCurrDateOneMonthsTimes()
+  detailSource.value.isCallMaterialsLabel = 'TRUE'
   return detailSource.value
 }
 const submit = () => {
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index dec0477b..c22cbb6a 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -285,7 +285,26 @@ const submitJob = () => {
     .then((res) => {
       uni.hideLoading()
       if (res.data) {
-        showCommitSuccessMessage(`提交成功<br>生成翻包记录<br>${res.data}`)
+        const list = []
+        const item = res.data
+        // 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: ''
+        })
+        // })
+        showCommitSuccessMessage(`提交成功<br>生成翻包记录<br>${list}`)
       } else {
         showErrorMessage(`提交失败[${res.msg}]`)
       }
@@ -358,12 +377,17 @@ const getFromLocationCode = (location, code) => {
   fromLocationCode.value = code
   openScanPopup()
 }
-const showCommitSuccessMessage = (hint) => {
+const showCommitSuccessMessage = (hint, pointData) => {
   comMessageRef.value.showSuccessMessage(hint, (res) => {
     if (res) {
       detailSource.value = []
       fromLocationCode.value = ''
       dataContent.value = {}
+      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 0dcf6b80..91f5f276 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -5,37 +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>
+									<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>
-				<view class="left-item">
-					<view class="label">数量</view>
-					<view class="value">{{ item.amount }}</view>
-				</view>
+									<view class="label">批次</view>
+									<view class="value">{{item.batch}}</view>
+								</view>
+								<view class="left-item">
+									<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>
 		<view class="" style="position: fixed; width: 100%; bottom: 0rpx; left: 0px">
@@ -102,23 +118,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 +150,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>`