From 9fffe228d5eec080c0f6382f161e21e3a69b9651 Mon Sep 17 00:00:00 2001 From: HongxuanG <1359774872@qq.com> Date: Fri, 4 Sep 2026 09:43:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=AB=E7=A0=81=E4=B8=8E=E7=BB=86?= =?UTF-8?q?=E7=A0=81=E6=98=8E=E7=BB=86=E5=B1=95=E7=A4=BA=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=8D=B7=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- src/common/storeFabricBusinessOut.js | 10 ++++++++++ src/common/storeFabricWarehouse.js | 2 ++ src/common/storeGoodsProcessIn.js | 7 +++++++ src/common/storeGoodsProcessOut.js | 7 +++++++ src/common/storeGoodsProcessReturnIn.js | 7 +++++++ src/common/storeGoodsPurchaseIn.js | 7 +++++++ src/components/storefabric/FabricOutScanDetail.vue | 4 ++++ src/components/storegoods/ProcessInDetailList.vue | 1 + src/components/storegoods/ProcessInScanDetail.vue | 12 ++++++++---- src/components/storegoods/ProcessOutDetailList.vue | 1 + src/components/storegoods/ProcessOutScanDetail.vue | 14 +++++++------- src/pages/saleship/salepickscandetail.vue | 5 +++++ .../storefabric/storefabricBusinessOutDetail.vue | 3 +++ .../storegoods/storeGoodsBusinessCheckAdd.vue | 3 +++ .../storegoods/storeGoodsBusinessCheckDetail.vue | 3 +++ src/pages/storegoods/storeGoodsBusinessInAdd.vue | 3 +++ .../storegoods/storeGoodsBusinessInDetail.vue | 3 +++ src/pages/storegoods/storeGoodsBusinessOutAdd.vue | 3 +++ .../storegoods/storeGoodsBusinessOutDetail.vue | 3 +++ .../storeGoodsBusinessStationMoveAdd.vue | 3 +++ .../storeGoodsBusinessStationMoveDetail.vue | 3 +++ .../storeGoodsBusinessStationMoveOnly.vue | 3 +++ 22 files changed, 96 insertions(+), 11 deletions(-) diff --git a/src/common/storeFabricBusinessOut.js b/src/common/storeFabricBusinessOut.js index f47d2df..83932c9 100644 --- a/src/common/storeFabricBusinessOut.js +++ b/src/common/storeFabricBusinessOut.js @@ -48,6 +48,7 @@ export const FABRIC_INFO_FIELDS = [ export const FINE_CODE_TABLE_COLUMNS = [ { label: '序号', key: 'seq', width: 80 }, { label: '卷号', key: 'roll_no', width: 110 }, + { label: '外部卷号', key: 'extern_volume_number', width: 140 }, { label: '匹数', key: 'roll', width: 100 }, { label: '数量(重量)', key: 'weight', width: 140 }, { label: '条码', key: 'bar_code', width: 280 }, @@ -232,6 +233,7 @@ export function getEmptyScanDetail() { yarn_batch: '', machine_number: '', volume_number: '', + extern_volume_number: '', grey_fabric_level_id: [], grey_fabric_level_name: '', weight: 0, @@ -265,6 +267,9 @@ export function buildScanDetailFromOrderResponse(order) { yarn_batch: raw.yarn_batch || '', machine_number: raw.machine_number || '', volume_number: raw.volume_number || '', + extern_volume_number: raw.extern_volume_number != null && raw.extern_volume_number !== '' + ? String(raw.extern_volume_number) + : '', grey_fabric_level_id: raw.grey_fabric_level_id || [], grey_fabric_level_name: raw.grey_fabric_level_name || '', weight: 0, @@ -316,6 +321,7 @@ export function buildScanDetailFromContext(context, order) { yarn_batch: item.yarn_batch || '', machine_number: item.machine_number || '', volume_number: fineCode.fabric_piece_code || fineCode.roll_no || fineCode.bar_code || '', + extern_volume_number: fineCode.extern_volume_number || '', grey_fabric_level_name: item.grey_fabric_level_name || '', weight: getFineCodeDisplayWeight(fineCode), scanned_roll: Number(scannedRoll.toFixed(2)), @@ -402,6 +408,9 @@ export function normalizeItem(item) { fine_codes: (item.item_fc_data || []).map((fc) => ({ id: fc.id, roll_no: fc.volume_number || '', + extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== '' + ? String(fc.extern_volume_number) + : '', fabric_piece_code: fc.fabric_piece_code || '', bar_code: fc.fabric_piece_code || fc.bar_code || '', position: fc.position || '', @@ -533,6 +542,7 @@ export function mapFineCodeTableRows(list, readonly) { return (list || []).map((item, index) => ({ seq: index + 1, roll_no: item.roll_no || '-', + extern_volume_number: item.extern_volume_number || '-', roll: item.roll != null && item.roll !== '' ? item.roll : '-', weight: item.weight != null && item.weight !== '' ? `${item.weight}` : '-', bar_code: item.bar_code || '-', diff --git a/src/common/storeFabricWarehouse.js b/src/common/storeFabricWarehouse.js index 0ac264c..34561e7 100644 --- a/src/common/storeFabricWarehouse.js +++ b/src/common/storeFabricWarehouse.js @@ -55,6 +55,7 @@ export const STOCK_TABLE_COLUMNS = [ export const WAREHOUSE_DETAIL_COLUMNS = [ { label: '序号', key: 'seq', width: 80 }, { label: '卷号', key: 'volume_number', width: 110 }, + { label: '外部卷号', key: 'extern_volume_number', width: 140 }, { label: '匹数', key: 'roll', width: 100 }, { label: '数量(KG)', key: 'weight', width: 130 }, { label: '条码', key: 'bar_code', width: 280 }, @@ -244,6 +245,7 @@ export function mapWarehouseDetailRows(list = []) { return (list || []).map((item, index) => ({ seq: index + 1, volume_number: item.volume_number || '-', + extern_volume_number: item.extern_volume_number || '-', roll: item.num != null && item.num !== '' ? formatRoll(item.num) : '-', weight: item.weight != null && item.weight !== '' ? formatWeightKg(item.weight) : '-', bar_code: item.bar_code || item.fabric_piece_code || '-', diff --git a/src/common/storeGoodsProcessIn.js b/src/common/storeGoodsProcessIn.js index 1b5ed6a..a8d2551 100644 --- a/src/common/storeGoodsProcessIn.js +++ b/src/common/storeGoodsProcessIn.js @@ -142,6 +142,9 @@ export function normalizeFineCode(fc) { return { id: fc.id, volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '', + extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== '' + ? String(fc.extern_volume_number) + : '', roll: formatRoll(fc.roll), weight: formatWeightKg(weightRaw), bar_code: barCode, @@ -243,6 +246,7 @@ export function getEmptyScanDetail() { quote_order_no: '', dyelot_number: '', volume_number: '', + extern_volume_number: '', product_code: '', product_color_code: '', order_roll: 0, @@ -269,6 +273,9 @@ export function buildScanDetailFromScanResponse(res) { quote_order_no: res.quote_order_no || '', dyelot_number: res.dyelot_number || '', volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '', + extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== '' + ? String(res.extern_volume_number) + : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), diff --git a/src/common/storeGoodsProcessOut.js b/src/common/storeGoodsProcessOut.js index 71e724a..844c734 100644 --- a/src/common/storeGoodsProcessOut.js +++ b/src/common/storeGoodsProcessOut.js @@ -120,6 +120,9 @@ export function normalizeFineCode(fc) { return { id: fc.id, volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '', + extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== '' + ? String(fc.extern_volume_number) + : '', roll: formatRoll(fc.roll), weight: formatWeightKg(weightRaw), bar_code: barCode, @@ -218,6 +221,7 @@ export function getEmptyScanDetail() { quote_order_no: '', dyelot_number: '', volume_number: '', + extern_volume_number: '', product_code: '', product_color_code: '', order_roll: 0, @@ -234,6 +238,9 @@ export function buildScanDetailFromScanResponse(res) { quote_order_no: res.quote_order_no || '', dyelot_number: res.dyelot_number || '', volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '', + extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== '' + ? String(res.extern_volume_number) + : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), diff --git a/src/common/storeGoodsProcessReturnIn.js b/src/common/storeGoodsProcessReturnIn.js index b50a325..c8765e8 100644 --- a/src/common/storeGoodsProcessReturnIn.js +++ b/src/common/storeGoodsProcessReturnIn.js @@ -112,6 +112,9 @@ export function normalizeFineCode(fc) { return { id: fc.id, volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '', + extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== '' + ? String(fc.extern_volume_number) + : '', roll: formatRoll(fc.roll), weight: formatWeightKg(weightRaw), bar_code: fc.bar_code || '', @@ -204,6 +207,7 @@ export function getEmptyScanDetail() { quote_order_no: '', dyelot_number: '', volume_number: '', + extern_volume_number: '', product_code: '', product_color_code: '', order_roll: 0, @@ -230,6 +234,9 @@ export function buildScanDetailFromScanResponse(res) { quote_order_no: res.quote_order_no || '', dyelot_number: res.dyelot_number || '', volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '', + extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== '' + ? String(res.extern_volume_number) + : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), diff --git a/src/common/storeGoodsPurchaseIn.js b/src/common/storeGoodsPurchaseIn.js index 38f445c..40a3232 100644 --- a/src/common/storeGoodsPurchaseIn.js +++ b/src/common/storeGoodsPurchaseIn.js @@ -157,6 +157,9 @@ export function normalizeFineCode(fc) { return { id: fc.id, volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '', + extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== '' + ? String(fc.extern_volume_number) + : '', roll: formatRoll(fc.roll), weight: formatWeightKg(weightRaw), bar_code: barCode, @@ -259,6 +262,7 @@ export function getEmptyScanDetail() { quote_order_no: '', dyelot_number: '', volume_number: '', + extern_volume_number: '', product_code: '', product_color_code: '', order_roll: 0, @@ -285,6 +289,9 @@ export function buildScanDetailFromScanResponse(res) { quote_order_no: res.quote_order_no || '', dyelot_number: res.dyelot_number || '', volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '', + extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== '' + ? String(res.extern_volume_number) + : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), diff --git a/src/components/storefabric/FabricOutScanDetail.vue b/src/components/storefabric/FabricOutScanDetail.vue index 7d97341..232ddf0 100644 --- a/src/components/storefabric/FabricOutScanDetail.vue +++ b/src/components/storefabric/FabricOutScanDetail.vue @@ -46,6 +46,10 @@ {{ detail.volume_number || '' }} + + 外部卷号： + {{ detail.extern_volume_number || '-' }} + diff --git a/src/components/storegoods/ProcessInDetailList.vue b/src/components/storegoods/ProcessInDetailList.vue index 5a2d22c..2318c06 100644 --- a/src/components/storegoods/ProcessInDetailList.vue +++ b/src/components/storegoods/ProcessInDetailList.vue @@ -83,6 +83,7 @@ import { buildItemGroups } from '@/common/storeGoodsProcessIn'; const FINE_COLUMNS = [ { label: '卷号', key: 'volume_number', width: 110 }, + { label: '外部卷号', key: 'extern_volume_number', width: 140 }, { label: '匹数', key: 'roll', width: 100 }, { label: '数量', key: 'weight', width: 130 }, { label: '仓位', key: 'warehouse_bin_name', width: 140 }, diff --git a/src/components/storegoods/ProcessInScanDetail.vue b/src/components/storegoods/ProcessInScanDetail.vue index 089e2e7..81a82ad 100644 --- a/src/components/storegoods/ProcessInScanDetail.vue +++ b/src/components/storegoods/ProcessInScanDetail.vue @@ -6,15 +6,19 @@ 卷号：{{ detail.volume_number || '-' }} + 外部卷号：{{ detail.extern_volume_number || '-' }} + + 成品编号：{{ detail.product_code || '-' }} - - 成品色号：{{ detail.product_color_code || '-' }} - 本行数量：{{ detail.item_weight != null ? detail.item_weight : '-' }} + 本行数量：{{ detail.item_weight != null ? detail.item_weight : '-' }} 本单匹数：{{ detail.order_roll != null ? detail.order_roll : '-' }} - 本单数量：{{ detail.order_weight != null ? detail.order_weight : '-' }} + + + 本单数量： + {{ detail.order_weight != null ? detail.order_weight : '-' }} diff --git a/src/components/storegoods/ProcessOutDetailList.vue b/src/components/storegoods/ProcessOutDetailList.vue index 06113e8..ea972d3 100644 --- a/src/components/storegoods/ProcessOutDetailList.vue +++ b/src/components/storegoods/ProcessOutDetailList.vue @@ -83,6 +83,7 @@ import { buildItemGroups } from '@/common/storeGoodsProcessOut'; const FINE_COLUMNS = [ { label: '卷号', key: 'volume_number', width: 110 }, + { label: '外部卷号', key: 'extern_volume_number', width: 140 }, { label: '匹数', key: 'roll', width: 100 }, { label: '数量', key: 'weight', width: 130 }, { label: '条码', key: 'bar_code', width: 260 }, diff --git a/src/components/storegoods/ProcessOutScanDetail.vue b/src/components/storegoods/ProcessOutScanDetail.vue index ee246c1..b035d2d 100644 --- a/src/components/storegoods/ProcessOutScanDetail.vue +++ b/src/components/storegoods/ProcessOutScanDetail.vue @@ -6,19 +6,19 @@ 卷号：{{ detail.volume_number || '-' }} + 外部卷号：{{ detail.extern_volume_number || '-' }} + + 成品编号：{{ detail.product_code || '-' }} - - 成品色号：{{ detail.product_color_code || '-' }} - 本行匹数：{{ detail.item_roll != null ? detail.item_roll : '-' }} + 本行匹数：{{ detail.item_roll != null ? detail.item_roll : '-' }} 本行数量：{{ detail.item_weight != null ? detail.item_weight : '-' }} - 本单匹数：{{ detail.order_roll != null ? detail.order_roll : '-' }} - - 本单数量： - {{ detail.order_weight != null ? detail.order_weight : '-' }} + + 本单匹数：{{ detail.order_roll != null ? detail.order_roll : '-' }} + 本单数量：{{ detail.order_weight != null ? detail.order_weight : '-' }} diff --git a/src/pages/saleship/salepickscandetail.vue b/src/pages/saleship/salepickscandetail.vue index 02543ff..92e0fbb 100644 --- a/src/pages/saleship/salepickscandetail.vue +++ b/src/pages/saleship/salepickscandetail.vue @@ -44,6 +44,9 @@ 成品缸号：{{ CrockNo }} 成品卷号：{{ GoodsBillNo }} + + 外部卷号：{{ ExternVolumeNumber }} + {{ BillDataMessage }} @@ -110,6 +113,7 @@ export default { GoodsCodeName: "", CrockNo: "", GoodsBillNo: "", + ExternVolumeNumber: "", BillSumRoll: 0, BillSumQty: 0, BillSumMQty: 0, @@ -367,6 +371,7 @@ export default { this.GoodsCodeName = aResultData.product_color_name; this.CrockNo = aResultData.dyelot_number; this.GoodsBillNo = aResultData.volume_number; + this.ExternVolumeNumber = aResultData.extern_volume_number || ''; this.QRBarCode = ""; if (aBarCodeDelStatus == 1) { diff --git a/src/pages/storefabric/storefabricBusinessOutDetail.vue b/src/pages/storefabric/storefabricBusinessOutDetail.vue index cef52a4..752a1c6 100644 --- a/src/pages/storefabric/storefabricBusinessOutDetail.vue +++ b/src/pages/storefabric/storefabricBusinessOutDetail.vue @@ -40,6 +40,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} @@ -113,6 +114,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, testFocus0: false, testFocus1: true, @@ -281,6 +283,7 @@ this.GoodsCodeName = aResultData.GoodsCodeName; this.CrockNo = aResultData.CrockNo; this.GoodsBillNo = aResultData.GoodsBillNo; + this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || ''; this.GoodsQty = aResultData.GoodsQty; this.BillSumRoll = parseFloat(aResultData.BillSumRoll); this.BillSumQty = parseFloat(aResultData.BillSumQty); diff --git a/src/pages/storegoods/storeGoodsBusinessCheckAdd.vue b/src/pages/storegoods/storeGoodsBusinessCheckAdd.vue index 1c617e7..eb21267 100644 --- a/src/pages/storegoods/storeGoodsBusinessCheckAdd.vue +++ b/src/pages/storegoods/storeGoodsBusinessCheckAdd.vue @@ -57,6 +57,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} 本架盘前：{{BillSumOldRoll}}条 @@ -146,6 +147,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, BillSumOldRoll: 0, BillSumNewRoll: 0, @@ -594,6 +596,7 @@ this.GoodsCodeName = aResultData.product_color_name; this.CrockNo = aResultData.dyelot_number; this.GoodsBillNo = aResultData.volume_number; + this.ExternVolumeNumber = aResultData.extern_volume_number || ''; this.GoodsQty = aResultData.weight / 10000; this.BillSumOldRoll = aResultData.warehouse_bin_check_before_roll/100; this.BillSumNewRoll = aResultData.warehouse_bin_check_roll/100; diff --git a/src/pages/storegoods/storeGoodsBusinessCheckDetail.vue b/src/pages/storegoods/storeGoodsBusinessCheckDetail.vue index 6f781a3..c8636b2 100644 --- a/src/pages/storegoods/storeGoodsBusinessCheckDetail.vue +++ b/src/pages/storegoods/storeGoodsBusinessCheckDetail.vue @@ -38,6 +38,7 @@ 成品缸号：{{ CrockNo }} 缸号卷号：{{ GoodsBillNo }} + 外部卷号：{{ ExternVolumeNumber }} @@ -106,6 +107,7 @@ export default { GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, StoreStationNameFocus: false, BillSumOldRoll: 0, @@ -251,6 +253,7 @@ export default { this.GoodsCodeName = aResultData.product_color_name; this.CrockNo = aResultData.dyelot_number; this.GoodsBillNo = aResultData.volume_number; + this.ExternVolumeNumber = aResultData.extern_volume_number || ''; this.GoodsQty = aResultData.weight / 10000; this.BillSumOldRoll = aResultData.warehouse_bin_check_before_roll / 100; this.BillSumNewRoll = aResultData.warehouse_bin_check_roll / 100; diff --git a/src/pages/storegoods/storeGoodsBusinessInAdd.vue b/src/pages/storegoods/storeGoodsBusinessInAdd.vue index c78c048..991c2da 100644 --- a/src/pages/storegoods/storeGoodsBusinessInAdd.vue +++ b/src/pages/storegoods/storeGoodsBusinessInAdd.vue @@ -75,6 +75,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} 本单条数：{{BillSumRoll}}条 @@ -161,6 +162,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, testFocus0: false, testFocus1: true, @@ -903,6 +905,7 @@ this.GoodsCodeName = aResultData.GoodsCodeName; this.CrockNo = aResultData.CrockNo; this.GoodsBillNo = aResultData.GoodsBillNo; + this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || ''; this.GoodsQty = aResultData.GoodsQty; this.BillSumRoll = parseFloat(aResultData.BillSumRoll); this.BillSumQty = parseFloat(aResultData.BillSumQty); diff --git a/src/pages/storegoods/storeGoodsBusinessInDetail.vue b/src/pages/storegoods/storeGoodsBusinessInDetail.vue index d5304b1..eaf9fe6 100644 --- a/src/pages/storegoods/storeGoodsBusinessInDetail.vue +++ b/src/pages/storegoods/storeGoodsBusinessInDetail.vue @@ -40,6 +40,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} @@ -115,6 +116,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, testFocus0: false, testFocus1: true, @@ -283,6 +285,7 @@ this.GoodsCodeName = aResultData.GoodsCodeName; this.CrockNo = aResultData.CrockNo; this.GoodsBillNo = aResultData.GoodsBillNo; + this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || ''; this.GoodsQty = aResultData.GoodsQty; this.BillSumRoll = parseFloat(aResultData.BillSumRoll); this.BillSumQty = parseFloat(aResultData.BillSumQty); diff --git a/src/pages/storegoods/storeGoodsBusinessOutAdd.vue b/src/pages/storegoods/storeGoodsBusinessOutAdd.vue index 0e6d54b..02351f0 100644 --- a/src/pages/storegoods/storeGoodsBusinessOutAdd.vue +++ b/src/pages/storegoods/storeGoodsBusinessOutAdd.vue @@ -78,6 +78,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} 本单条数：{{BillSumRoll}}条 @@ -164,6 +165,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, testFocus0: false, testFocus1: true, @@ -816,6 +818,7 @@ this.GoodsCodeName = aResultData.GoodsCodeName; this.CrockNo = aResultData.CrockNo; this.GoodsBillNo = aResultData.GoodsBillNo; + this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || ''; this.GoodsQty = aResultData.GoodsQty; this.BillSumRoll = parseFloat(aResultData.BillSumRoll); this.BillSumQty = parseFloat(aResultData.BillSumQty); diff --git a/src/pages/storegoods/storeGoodsBusinessOutDetail.vue b/src/pages/storegoods/storeGoodsBusinessOutDetail.vue index cef52a4..752a1c6 100644 --- a/src/pages/storegoods/storeGoodsBusinessOutDetail.vue +++ b/src/pages/storegoods/storeGoodsBusinessOutDetail.vue @@ -40,6 +40,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} @@ -113,6 +114,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, testFocus0: false, testFocus1: true, @@ -281,6 +283,7 @@ this.GoodsCodeName = aResultData.GoodsCodeName; this.CrockNo = aResultData.CrockNo; this.GoodsBillNo = aResultData.GoodsBillNo; + this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || ''; this.GoodsQty = aResultData.GoodsQty; this.BillSumRoll = parseFloat(aResultData.BillSumRoll); this.BillSumQty = parseFloat(aResultData.BillSumQty); diff --git a/src/pages/storegoods/storeGoodsBusinessStationMoveAdd.vue b/src/pages/storegoods/storeGoodsBusinessStationMoveAdd.vue index 185f07d..dfaba48 100644 --- a/src/pages/storegoods/storeGoodsBusinessStationMoveAdd.vue +++ b/src/pages/storegoods/storeGoodsBusinessStationMoveAdd.vue @@ -66,6 +66,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} 本单条数：{{BillSumRoll}}条 @@ -155,6 +156,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, FromStoreStationFocus: false, ToStoreStationFocus: true, @@ -711,6 +713,7 @@ this.GoodsCodeName = aResultData.GoodsCodeName; this.CrockNo = aResultData.CrockNo; this.GoodsBillNo = aResultData.GoodsBillNo; + this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || ''; this.GoodsQty = aResultData.GoodsQty; this.GoodsCodeSumRoll = parseFloat(aResultData.GoodsCodeSumRoll); this.GoodsCodeSumQty = parseFloat(aResultData.GoodsCodeSumQty); diff --git a/src/pages/storegoods/storeGoodsBusinessStationMoveDetail.vue b/src/pages/storegoods/storeGoodsBusinessStationMoveDetail.vue index a1434bc..bc4af9b 100644 --- a/src/pages/storegoods/storeGoodsBusinessStationMoveDetail.vue +++ b/src/pages/storegoods/storeGoodsBusinessStationMoveDetail.vue @@ -48,6 +48,7 @@ 成品缸号：{{CrockNo}} 缸号卷号：{{GoodsBillNo}} + 外部卷号：{{ExternVolumeNumber}} 本单条数：{{BillSumRoll}}条 @@ -119,6 +120,7 @@ GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, FromStoreStationFocus: false, ToStoreStationFocus: true, @@ -360,6 +362,7 @@ this.GoodsCodeName = aResultData.GoodsCodeName; this.CrockNo = aResultData.CrockNo; this.GoodsBillNo = aResultData.GoodsBillNo; + this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || ''; this.GoodsQty = aResultData.GoodsQty; this.GoodsCodeSumRoll = parseFloat(aResultData.GoodsCodeSumRoll); this.GoodsCodeSumQty = parseFloat(aResultData.GoodsCodeSumQty); diff --git a/src/pages/storegoods/storeGoodsBusinessStationMoveOnly.vue b/src/pages/storegoods/storeGoodsBusinessStationMoveOnly.vue index bd9889e..1bddc53 100644 --- a/src/pages/storegoods/storeGoodsBusinessStationMoveOnly.vue +++ b/src/pages/storegoods/storeGoodsBusinessStationMoveOnly.vue @@ -49,6 +49,7 @@ 成品缸号：{{ CrockNo }} 缸号卷号：{{ GoodsBillNo }} + 外部卷号：{{ ExternVolumeNumber }} @@ -110,6 +111,7 @@ export default { GoodsCodeName: '', CrockNo: '', GoodsBillNo: '', + ExternVolumeNumber: '', GoodsQty: 0, FromStoreStationFocus: false, QRBarCodeFocus: false, @@ -446,6 +448,7 @@ export default { this.GoodsCodeName = aResultData.product_color_name; this.CrockNo = aResultData.dyelot_number; this.GoodsBillNo = aResultData.volume_number; + this.ExternVolumeNumber = aResultData.extern_volume_number || ''; this.GoodsQty = aResultData.weight / 10000; this.StoreStationSumRoll = aResultData.warehouse_bin_roll / 100; this.StoreStationSumQty = aResultData.warehouse_bin_weight / 10000;