From feb78385ebc9ff6968746ef550c4b23bd5b72afd Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 14 Jan 2026 15:55:55 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=89=93=E5=8D=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/MdPbGroupplateMapper.xml | 5 +- .../src/views/wms/basedata/bucked/index.vue | 60 +++++++++++++- .../src/views/wms/basedata/groupbag/index.vue | 78 +++++++++++++++++++ 3 files changed, 141 insertions(+), 2 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml index 5220a66..a5b3621 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml @@ -27,11 +27,14 @@ mater.material_name, mater.material_spec, mater.material_model, - supp.supp_name + supp.supp_name, + class.class_code, + class.class_name FROM md_pb_groupplate late INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id INNER JOIN md_cs_supplierbase supp ON supp.supp_code = late.supp_code + LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id 1 = 1 diff --git a/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue b/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue index 7d0ab28..e875802 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue @@ -224,6 +224,7 @@ export default { return { permission: {}, materList: [], + recordNo: null, rules: { material_code: [ { required: true, message: '物料不能为空', trigger: 'blur' } @@ -244,6 +245,9 @@ export default { crudGroup.queryMaterList({}).then(res => { this.materList = res }) + crudGroup.queryRecordNo({}).then(res => { + this.recordNo = res.recordNo + }) }, methods: { // 钩子:在获取表格数据之前执行,false 则代表不获取数据 @@ -270,11 +274,65 @@ export default { LODOP.PRINT_INIT('') LODOP.SET_PRINT_PAGESIZE(1, '94mm', '119mm', '') LODOP.ADD_PRINT_RECT('1mm', '3mm', '92mm', '117mm', 0, 1) - LODOP.ADD_PRINT_BARCODE('42.57mm', '15.05mm', '69.8mm', '23.97mm', '128A', row.bucket_code + '') + LODOP.ADD_PRINT_TEXT('2.88mm', '35.4mm', '32.65mm', '5.95mm', '中 美 华 东 制 药') + LODOP.ADD_PRINT_TEXT('6.56mm', '22.33mm', '62.02mm', '5.69mm', 'Zhongmei Huadong Pharmaceutical') + LODOP.ADD_PRINT_TEXT('10.45mm', '13.86mm', '98mm', '7.01mm', '周 转 物 料 卡 Turnover Material Card') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 11) + LODOP.ADD_PRINT_TEXT('15.48mm', '5.13mm', '93.24mm', '5.69mm', '依据《状态标识牌的有关规定》(QA-SMP-B005)制定此记录') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('19.45mm', '5.13mm', '128.69mm', '7.01mm', 'Establish this record according to “SMP for status signboard”') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('22.89mm', '5.13mm', '27.62mm', '4.37mm', '(QA-SMP-B005)') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('26.86mm', '5.13mm', '66.78mm', '4.37mm', '记录编号 Record No.: ' + this.recordNo + '') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('31.64mm', '4.87mm', '87.95mm', '5.69mm', '物 料 名 称 Material Name: ' + row.material_name + '') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '') + LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ' + row.bucket_code + '') + LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ' + row.bucket_weight + '') + LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ') + LODOP.ADD_PRINT_TEXT('51.81mm', '4.47mm', '41.65mm', '5.69mm', '净 重 Net Weight: ') + LODOP.ADD_PRINT_TEXT('56.83mm', '4.47mm', '86.62mm', '7.01mm', '操 作 日 期 Operation Date: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('62.92mm', '4.47mm', '85.3mm', '7.01mm', '有 效 期 至 Expiry Date: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('69.22mm', '5mm', '22.07mm', '5.69mm', '用 于 产 品') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('73.71mm', '5mm', '11.22mm', '5.69mm', 'Used') + LODOP.ADD_PRINT_TEXT('73.71mm', '17.44mm', '8.57mm', '5.69mm', 'in') + LODOP.ADD_PRINT_TEXT('77.68mm', '5mm', '16.77mm', '5.69mm', 'Product') + LODOP.ADD_PRINT_TEXT('69.45mm', '28.28mm', '23.65mm', '5.69mm', '名 称 Name: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('76.23mm', '28.28mm', '31.86mm', '5.69mm', '规 格 Strength: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('83.98mm', '5.27mm', '51.17mm', '5.69mm', '操 作 人 Operator: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('92.21mm', '5.27mm', '48mm', '5.69mm', '复 核 人 Reviewer: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('99.7mm', '5.27mm', '39.26mm', '5.69mm', '备 注 Remarks:') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_LINE(114, 11, 114, 360, 0, 0) + LODOP.ADD_PRINT_LINE(136, 11, 136, 360, 0, 0) + LODOP.ADD_PRINT_LINE(171, 11, 171, 360, 0, 0) + LODOP.ADD_PRINT_LINE(209, 11, 209, 360, 0, 0) + LODOP.ADD_PRINT_LINE(231, 11, 231, 360, 0, 0) + LODOP.ADD_PRINT_LINE(254, 11, 254, 360, 0, 0) + LODOP.ADD_PRINT_LINE(282, 97, 282, 360, 0, 0) + + LODOP.ADD_PRINT_LINE(309, 11, 309, 360, 0, 0) + LODOP.ADD_PRINT_LINE(339, 11, 339, 360, 0, 0) + LODOP.ADD_PRINT_LINE(370, 11, 370, 360, 0, 0) + LODOP.ADD_PRINT_LINE(397, 11, 397, 360, 0, 0) + LODOP.ADD_PRINT_LINE(309, 96, 254, 96, 0, 1) + LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bucket_code) LODOP.PRINT()// 打印 // LODOP.PREVIEW()// 预览 // LODOP.PRINT_DESIGN() + this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() } diff --git a/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue index 198bc95..52cbdad 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue @@ -329,6 +329,15 @@ export default { }, printTable() { const row = this.$refs.table.selection[0] + const class_code = row.class_code + if (class_code === 'YL001' || class_code === 'FL001' || class_code === 'NBC001') { + // 原料、辅料、内包材 + this.printOne(row) + } else { + this.printTwo(row) + } + }, + printOne(row) { const LODOP = getLodop() LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 // 打印纸张大小设置https://www.it610.com/article/2094844.html @@ -400,6 +409,75 @@ export default { // LODOP.PREVIEW()// 预览 // LODOP.PRINT_DESIGN() + this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }, + printTwo(row) { + const LODOP = getLodop() + LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 + // 打印纸张大小设置https://www.it610.com/article/2094844.html + LODOP.PRINT_INIT('') + LODOP.SET_PRINT_PAGESIZE(1, '94mm', '119mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '92mm', '117mm', 0, 1) + LODOP.ADD_PRINT_TEXT('2.88mm', '35.4mm', '32.65mm', '5.95mm', '中 美 华 东 制 药') + LODOP.ADD_PRINT_TEXT('6.56mm', '22.33mm', '62.02mm', '5.69mm', 'Zhongmei Huadong Pharmaceutical') + LODOP.ADD_PRINT_TEXT('10.45mm', '13.86mm', '98mm', '7.01mm', '周 转 物 料 卡 Turnover Material Card') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 11) + LODOP.ADD_PRINT_TEXT('15.48mm', '5.13mm', '93.24mm', '5.69mm', '依据《状态标识牌的有关规定》(QA-SMP-B005)制定此记录') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('19.45mm', '5.13mm', '128.69mm', '7.01mm', 'Establish this record according to “SMP for status signboard”') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('22.89mm', '5.13mm', '27.62mm', '4.37mm', '(QA-SMP-B005)') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('26.86mm', '5.13mm', '66.78mm', '4.37mm', '记录编号 Record No.: ' + this.recordNo + '') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) + LODOP.ADD_PRINT_TEXT('31.64mm', '4.87mm', '87.95mm', '5.69mm', '物 料 名 称 Material Name: ' + row.material_name + '') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '') + LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ') + LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ') + LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ') + LODOP.ADD_PRINT_TEXT('51.81mm', '4.47mm', '41.65mm', '5.69mm', '净 重 Net Weight: ') + LODOP.ADD_PRINT_TEXT('56.83mm', '4.47mm', '86.62mm', '7.01mm', '操 作 日 期 Operation Date: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('62.92mm', '4.47mm', '85.3mm', '7.01mm', '有 效 期 至 Expiry Date: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('69.22mm', '5mm', '22.07mm', '5.69mm', '用 于 产 品') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('73.71mm', '5mm', '11.22mm', '5.69mm', 'Used') + LODOP.ADD_PRINT_TEXT('73.71mm', '17.44mm', '8.57mm', '5.69mm', 'in') + LODOP.ADD_PRINT_TEXT('77.68mm', '5mm', '16.77mm', '5.69mm', 'Product') + LODOP.ADD_PRINT_TEXT('69.45mm', '28.28mm', '23.65mm', '5.69mm', '名 称 Name: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('76.23mm', '28.28mm', '31.86mm', '5.69mm', '规 格 Strength: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('83.98mm', '5.27mm', '51.17mm', '5.69mm', '操 作 人 Operator: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('92.21mm', '5.27mm', '48mm', '5.69mm', '复 核 人 Reviewer: ') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_TEXT('99.7mm', '5.27mm', '39.26mm', '5.69mm', '备 注 Remarks:') + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) + LODOP.ADD_PRINT_LINE(114, 11, 114, 360, 0, 0) + LODOP.ADD_PRINT_LINE(136, 11, 136, 360, 0, 0) + LODOP.ADD_PRINT_LINE(171, 11, 171, 360, 0, 0) + LODOP.ADD_PRINT_LINE(209, 11, 209, 360, 0, 0) + LODOP.ADD_PRINT_LINE(231, 11, 231, 360, 0, 0) + LODOP.ADD_PRINT_LINE(254, 11, 254, 360, 0, 0) + LODOP.ADD_PRINT_LINE(282, 97, 282, 360, 0, 0) + + LODOP.ADD_PRINT_LINE(309, 11, 309, 360, 0, 0) + LODOP.ADD_PRINT_LINE(339, 11, 339, 360, 0, 0) + LODOP.ADD_PRINT_LINE(370, 11, 370, 360, 0, 0) + LODOP.ADD_PRINT_LINE(397, 11, 397, 360, 0, 0) + LODOP.ADD_PRINT_LINE(309, 96, 254, 96, 0, 1) + LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bag_code) + + LODOP.PRINT()// 打印 + // LODOP.PREVIEW()// 预览 + // LODOP.PRINT_DESIGN() + this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }