From b5c618d7d6df0e8246235f226f9a4c3fac6f9fe2 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 28 Aug 2024 17:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E6=89=93=E5=8D=B0=202024/6/1?=
=?UTF-8?q?5=2014:17:06=E6=B2=A1=E6=94=B9=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../package/job/overPackageJobDetail.vue | 14 ++++++----
src/pages/pointProductReceipt/index.vue | 26 +++++++++----------
.../job/productPutawayDetail.vue | 5 +++-
.../job/fgProductReceiptDetail.vue | 4 +--
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 3b47c39a..68e4cdb9 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -230,13 +230,17 @@ const submitJob = () => {
const 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: ''
})
diff --git a/src/pages/pointProductReceipt/index.vue b/src/pages/pointProductReceipt/index.vue
index a3fee47b..b6ca2845 100644
--- a/src/pages/pointProductReceipt/index.vue
+++ b/src/pages/pointProductReceipt/index.vue
@@ -12,8 +12,8 @@
{{item.itemName}}
- 物料描述
- {{item.itemDesc1}}
+ 包装名称
+ {{item.packName}}
包装号
@@ -37,8 +37,8 @@
{{item.batch}}
- 班次
- {{item.shiftCode}}
+ 物料类型
+ {{item.itemType}}
打印时间
@@ -116,20 +116,20 @@
${item.itemName}
- 物料描述
- {{item.itemDesc1}}
+ 包装名称
+ ${item.packName}
包装号
- {{item.relateNumber}}
+ ${item.relateNumber}
生产线
- {{item.productionLineCode}}
+ ${item.productionLineCode}
数量
- {{item.qty}}
+ ${item.qty}
@@ -138,15 +138,15 @@
批次
- {{item.batch}}
+ ${item.batch}
- 班次
- {{item.shiftCode}}
+ 物料类型
+ ${item.itemType}
打印时间
- {{item.printTimes}}
+ ${item.printTimes}
`
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index f53b2048..cec9d175 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -157,7 +157,10 @@ const getDetail = () => {
detailSource.value = getDataSource(subList.value)
detailSource.value.forEach((r) => {
r.subList.forEach((s) => {
- if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) s.scaned = true
+ if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) {
+ s.scaned = true
+ s.handleQty = s.qty
+ }
})
})
toLocationAreaTypeList.value = getLocationTypeArray(jobContent.value.toAreaTypes)
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 9d0e35e2..1d54c96a 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -67,9 +67,9 @@ import { ref, getCurrentInstance, nextTick } from 'vue'
import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
import { Decimal } from 'decimal.js' // 引入
import { getManagementPrecisions } from '@/common/balance.js'
+import { getCurrDateTime, goHome, navigateBack, getPackingNumberAndBatch, getSwitchInfoByCode } from '@/common/basic.js'
import { getProductReceiptJobDetail, takeProductReceiptJob, cancleTakeProductReceiptJob, productReceiptJobsubmit, getPrintProductReceiptList, getBalanceToPackage, batchPrintingLable } from '@/api/request2.js'
-import { goHome, navigateBack, getPackingNumberAndBatch, getSwitchInfoByCode } from '@/common/basic.js'
import { getDirectoryItemArray, getInventoryStatusName } from '@/common/directory.js'
@@ -324,7 +324,7 @@ const print = () => {
productionLineCode: item.productionLineCode || '', // 生产线
shiftCode: item.shiftCode || '', // 班次
qty: item.qty || '', // 数量
- printTimes: item.printTimes || '' // 打印时间
+ printTimes: getCurrDateTime() // 打印时间
})
})
uni.navigateTo({