From 8d645fdadafaf54a2643e447f272a5529ac17456 Mon Sep 17 00:00:00 2001 From: xiangxy Date: Fri, 17 Oct 2025 14:27:22 +0800 Subject: [PATCH] change --- locale/en.json | 2 +- locale/zh-Hans.json | 2 +- pages/check/check-task.vue | 2 +- pages/common/mater-list.vue | 2 +- pages/common/mater-list2.vue | 2 +- pages/entry/bill-to-store.vue | 4 +- pages/entry/check-to-store.vue | 2 +- pages/entry/group-to-store.vue | 2 +- pages/entry/groupplate-instore.vue | 2 +- pages/entry/mater-group-to-store.vue | 2 +- pages/entry/mater-group.vue | 2 +- pages/entry/mater-group2.vue | 2 +- pages/entry/pick-yl-return-store.vue | 2 +- pages/entry/qualified-to-store.vue | 2 +- pages/ftdl/kc-manage.vue | 2 +- pages/ftdl/line-call-mater.vue | 1 + pages/ftdl/line-down-mater.vue | 73 +++++++++++++++--------- pages/ftdl/man-get-goods.vue | 2 +- pages/ftdl/man-load-goods.vue | 73 +++++++++++++++--------- pages/ftdl/mater-list-cxjl.vue | 2 +- pages/ftdl/mater-list0.vue | 2 +- pages/outbound/bill-out-store.vue | 2 +- pages/outbound/line-callmater.vue | 2 +- pages/outbound/mater-outstore.vue | 2 +- pages/outbound/out-store-confirm.vue | 2 +- pages/outbound/produce-out-store-2nd.vue | 2 +- pages/outbound/quhuo-confirm.vue | 2 +- pages/pick/pick-task.vue | 2 +- utils/mork2.js | 4 +- 29 files changed, 123 insertions(+), 80 deletions(-) diff --git a/locale/en.json b/locale/en.json index 436d259..4d881c8 100644 --- a/locale/en.json +++ b/locale/en.json @@ -70,7 +70,7 @@ "grid.number": "序号", "grid.roll-number": "卷号", "grid.material-code": "物料编码", - "grid.material-name": "物料名称", + "grid.material-name": "物料品种", "grid.quantity": "数量", "grid.unit": "单位", "grid.status": "状态", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index a43c8b3..8f15757 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -70,7 +70,7 @@ "grid.number": "序号", "grid.roll-number": "卷号", "grid.material-code": "物料编码", - "grid.material-name": "物料名称", + "grid.material-name": "物料品种", "grid.quantity": "数量", "grid.unit": "单位", "grid.status": "状态", diff --git a/pages/check/check-task.vue b/pages/check/check-task.vue index 558d9b1..00ff391 100644 --- a/pages/check/check-task.vue +++ b/pages/check/check-task.vue @@ -57,7 +57,7 @@ - 物料名称 + 物料品种 diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue index be3ea43..5a9479f 100644 --- a/pages/common/mater-list.vue +++ b/pages/common/mater-list.vue @@ -19,7 +19,7 @@ - 物料名称 + 物料品种 物料编码 数量 批次号 diff --git a/pages/common/mater-list2.vue b/pages/common/mater-list2.vue index cffe609..7e4b1de 100644 --- a/pages/common/mater-list2.vue +++ b/pages/common/mater-list2.vue @@ -18,7 +18,7 @@ - + diff --git a/pages/entry/bill-to-store.vue b/pages/entry/bill-to-store.vue index 7396a23..e94de50 100644 --- a/pages/entry/bill-to-store.vue +++ b/pages/entry/bill-to-store.vue @@ -23,7 +23,7 @@ - 物料名称 + 物料品种 @@ -117,7 +117,7 @@ - + diff --git a/pages/entry/check-to-store.vue b/pages/entry/check-to-store.vue index a1e79fb..3e7971c 100644 --- a/pages/entry/check-to-store.vue +++ b/pages/entry/check-to-store.vue @@ -22,7 +22,7 @@ - 物料名称 + 物料品种 diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue index 592bec6..5b68b9a 100644 --- a/pages/entry/group-to-store.vue +++ b/pages/entry/group-to-store.vue @@ -44,7 +44,7 @@ {{currentData.material_code}} - 物料名称 + 物料品种 {{currentData.material_name}} diff --git a/pages/entry/groupplate-instore.vue b/pages/entry/groupplate-instore.vue index f171ee2..d08c1c7 100644 --- a/pages/entry/groupplate-instore.vue +++ b/pages/entry/groupplate-instore.vue @@ -29,7 +29,7 @@
物料名称物料品种 物料规格 物料编码
序号 物料编码物料名称物料品种 物料数量 单位 单据状态
- + diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue index b3baa93..5af68c4 100644 --- a/pages/entry/mater-group-to-store.vue +++ b/pages/entry/mater-group-to-store.vue @@ -14,7 +14,7 @@ - 物料名称 + 物料品种 diff --git a/pages/entry/mater-group.vue b/pages/entry/mater-group.vue index 63e3b2c..92e68cf 100644 --- a/pages/entry/mater-group.vue +++ b/pages/entry/mater-group.vue @@ -34,7 +34,7 @@
物料名称物料品种 物料编码 数量 批次号
- + diff --git a/pages/entry/mater-group2.vue b/pages/entry/mater-group2.vue index c85523e..f6505e4 100644 --- a/pages/entry/mater-group2.vue +++ b/pages/entry/mater-group2.vue @@ -30,7 +30,7 @@ - 物料名称 + 物料品种 diff --git a/pages/entry/pick-yl-return-store.vue b/pages/entry/pick-yl-return-store.vue index 4b2ae22..b31f885 100644 --- a/pages/entry/pick-yl-return-store.vue +++ b/pages/entry/pick-yl-return-store.vue @@ -25,7 +25,7 @@ - 物料名称 + 物料品种 diff --git a/pages/entry/qualified-to-store.vue b/pages/entry/qualified-to-store.vue index 8246b0b..7c03c36 100644 --- a/pages/entry/qualified-to-store.vue +++ b/pages/entry/qualified-to-store.vue @@ -42,7 +42,7 @@ {{currentData.material_code}} - 物料名称 + 物料品种 {{currentData.material_name}} diff --git a/pages/ftdl/kc-manage.vue b/pages/ftdl/kc-manage.vue index a9d7499..3cb5d71 100644 --- a/pages/ftdl/kc-manage.vue +++ b/pages/ftdl/kc-manage.vue @@ -43,7 +43,7 @@ diff --git a/pages/ftdl/line-call-mater.vue b/pages/ftdl/line-call-mater.vue index ce54b20..e602c93 100644 --- a/pages/ftdl/line-call-mater.vue +++ b/pages/ftdl/line-call-mater.vue @@ -141,6 +141,7 @@ title: res.message, icon: 'none' }) + this.currentData = {} this.clearUp() this.disabled = false } catch (e) { diff --git a/pages/ftdl/line-down-mater.vue b/pages/ftdl/line-down-mater.vue index 044b6fc..60d0ae9 100644 --- a/pages/ftdl/line-down-mater.vue +++ b/pages/ftdl/line-down-mater.vue @@ -39,7 +39,7 @@ @@ -161,32 +161,53 @@ uni.scanCode({ success: (res) => { // console.log('扫码成功:', res.result); - const parts = res.result.split(';') - if (parts.length !== 5) { - uni.showToast({ - title: '二维码格式不正确，请扫描符合格式的二维码', - icon: 'none' - }) - return + if (res.result.includes(';')) { + const parts = res.result.split(';') + if (parts.length !== 5) { + uni.showToast({ + title: '二维码格式不正确，请扫描符合格式的二维码', + icon: 'none' + }) + return + } + let currObj = { + mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9), + container_code: parts[0], + material_code: parts[1], + material_name: parts[2], + qty: parts[3], + measure_unit_id: parts[4], + } + // 检查是否已存在相同卷号 + const exists = this.dataList.some(item => item.container_code === currObj.container_code) + if (exists) { + uni.showToast({ + title: '已存在', + icon: 'none' + }) + return + } + this.dataList.push(currObj) + } else { + let currObj = { + mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9), + container_code: res.result, + material_code: '', + material_name: '', + qty: '', + measure_unit_id: '' + } + // 检查是否已存在相同卷号 + const exists = this.dataList.some(item => item.container_code === currObj.container_code) + if (exists) { + uni.showToast({ + title: '已存在', + icon: 'none' + }) + return + } + this.dataList.push(currObj) } - let currObj = { - mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9), - container_code: parts[0], - material_code: parts[1], - material_name: parts[2], - qty: parts[3], - measure_unit_id: parts[4], - } - // 检查是否已存在相同卷号 - const exists = this.dataList.some(item => item.container_code === currObj.container_code) - if (exists) { - uni.showToast({ - title: '已存在', - icon: 'none' - }) - return - } - this.dataList.push(currObj) }, fail: (err) => { console.log('扫码失败:', err) diff --git a/pages/ftdl/man-get-goods.vue b/pages/ftdl/man-get-goods.vue index 4c22df3..c212df4 100644 --- a/pages/ftdl/man-get-goods.vue +++ b/pages/ftdl/man-get-goods.vue @@ -25,7 +25,7 @@ diff --git a/pages/ftdl/man-load-goods.vue b/pages/ftdl/man-load-goods.vue index ba2bba7..762c5bc 100644 --- a/pages/ftdl/man-load-goods.vue +++ b/pages/ftdl/man-load-goods.vue @@ -31,7 +31,7 @@ @@ -148,32 +148,53 @@ uni.scanCode({ success: (res) => { // console.log('扫码成功:', res.result); - const parts = res.result.split(';') - if (parts.length !== 5) { - uni.showToast({ - title: '二维码格式不正确，请扫描符合格式的二维码', - icon: 'none' - }) - return + if (res.result.includes(';')) { + const parts = res.result.split(';') + if (parts.length !== 5) { + uni.showToast({ + title: '二维码格式不正确，请扫描符合格式的二维码', + icon: 'none' + }) + return + } + let currObj = { + mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9), + container_code: parts[0], + material_code: parts[1], + material_name: parts[2], + qty: parts[3], + measure_unit_id: parts[4], + } + // 检查是否已存在相同卷号 + const exists = this.dataList.some(item => item.container_code === currObj.container_code) + if (exists) { + uni.showToast({ + title: '已存在', + icon: 'none' + }) + return + } + this.dataList.push(currObj) + } else { + let currObj = { + mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9), + container_code: res.result, + material_code: '', + material_name: '', + qty: '', + measure_unit_id: '' + } + // 检查是否已存在相同卷号 + const exists = this.dataList.some(item => item.container_code === currObj.container_code) + if (exists) { + uni.showToast({ + title: '已存在', + icon: 'none' + }) + return + } + this.dataList.push(currObj) } - let currObj = { - mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9), - container_code: parts[0], - material_code: parts[1], - material_name: parts[2], - qty: parts[3], - measure_unit_id: parts[4], - } - // 检查是否已存在相同卷号 - const exists = this.dataList.some(item => item.container_code === currObj.container_code) - if (exists) { - uni.showToast({ - title: '已存在', - icon: 'none' - }) - return - } - this.dataList.push(currObj) }, fail: (err) => { console.log('扫码失败:', err) diff --git a/pages/ftdl/mater-list-cxjl.vue b/pages/ftdl/mater-list-cxjl.vue index 64d17fc..6ecc3c7 100644 --- a/pages/ftdl/mater-list-cxjl.vue +++ b/pages/ftdl/mater-list-cxjl.vue @@ -20,7 +20,7 @@ + --> diff --git a/pages/ftdl/mater-list0.vue b/pages/ftdl/mater-list0.vue index 6a8e715..7091e6e 100644 --- a/pages/ftdl/mater-list0.vue +++ b/pages/ftdl/mater-list0.vue @@ -29,7 +29,7 @@ diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue index f960b20..3f6b812 100644 --- a/pages/outbound/bill-out-store.vue +++ b/pages/outbound/bill-out-store.vue @@ -50,7 +50,7 @@ diff --git a/pages/outbound/line-callmater.vue b/pages/outbound/line-callmater.vue index f9b99d9..a70ee11 100644 --- a/pages/outbound/line-callmater.vue +++ b/pages/outbound/line-callmater.vue @@ -36,7 +36,7 @@ - + diff --git a/pages/outbound/mater-outstore.vue b/pages/outbound/mater-outstore.vue index 21f7e37..822f103 100644 --- a/pages/outbound/mater-outstore.vue +++ b/pages/outbound/mater-outstore.vue @@ -36,7 +36,7 @@ - + diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue index 3302aa8..83bc6cd 100644 --- a/pages/outbound/out-store-confirm.vue +++ b/pages/outbound/out-store-confirm.vue @@ -17,7 +17,7 @@ - 物料名称 + 物料品种 diff --git a/pages/outbound/produce-out-store-2nd.vue b/pages/outbound/produce-out-store-2nd.vue index 073bd06..7230d9c 100644 --- a/pages/outbound/produce-out-store-2nd.vue +++ b/pages/outbound/produce-out-store-2nd.vue @@ -49,7 +49,7 @@ - + diff --git a/pages/outbound/quhuo-confirm.vue b/pages/outbound/quhuo-confirm.vue index 0823e51..e3a283b 100644 --- a/pages/outbound/quhuo-confirm.vue +++ b/pages/outbound/quhuo-confirm.vue @@ -17,7 +17,7 @@ - 物料名称 + 物料品种 diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue index 1a3d9cc..7b17aa0 100644 --- a/pages/pick/pick-task.vue +++ b/pages/pick/pick-task.vue @@ -277,7 +277,7 @@ - + diff --git a/utils/mork2.js b/utils/mork2.js index 280c2b3..c5d6aed 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -144,7 +144,7 @@ export const outStorageOrderList = (page, size, type) => { }, { "code": "CCC", - "material_name": "物料名称", + "material_name": "物料品种", "material_code": "物料编码", "material_spec": "物料类型", "stor_code": "FStockPallet", @@ -201,7 +201,7 @@ export const outStorageOrderConfirm = (code) => { }, { "code": "CCC", - "material_name": "物料名称", + "material_name": "物料品种", "material_code": "物料编码", "material_spec": "物料类型", "stor_code": "FStockPallet",
物料名称物料品种 物料编码 数量 批次号 {{$t('grid.number')}} {{$t('grid.number')}} {{$t('grid.number')}}
物料品种{{$t('grid.material-code')}} {{$t('grid.material-name')}}
{{$t('grid.material-code')}} - 物料名称 + 物料品种 物料编码
库位 载具编码物料名称物料品种 数量 物料规格 物料编码
库位 载具编码物料名称物料品种 数量 物料规格 物料编码
选择物料名称物料品种 物料编码 物料状态 数量 ${data.material_code}
物料名称物料品种 ${data.material_name}