From 39e933a18f8357ac205caf8c90c3e08d9319c80e Mon Sep 17 00:00:00 2001 From: user Date: Sun, 16 Mar 2025 16:48:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(dict):=20=E6=9B=B4=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E8=A1=A8=E7=BB=93=E6=9E=84=E5=B9=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E7=89=A9=E6=96=99=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改字典表唯一约束,增加 parent_number 列 - 在 dict.csv 中添加新的物料大类和子类 --- .../changelog/20240325000005_added_entity_Dict.xml | 4 ++-- src/main/resources/config/liquibase/data/dict.csv | 6 ++++++ src/main/webapp/app/orders/order/order-print.component.ts | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml b/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml index 71302ab..049ab64 100644 --- a/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml +++ b/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml @@ -39,8 +39,8 @@ diff --git a/src/main/resources/config/liquibase/data/dict.csv b/src/main/resources/config/liquibase/data/dict.csv index a48b09e..70f77c9 100644 --- a/src/main/resources/config/liquibase/data/dict.csv +++ b/src/main/resources/config/liquibase/data/dict.csv @@ -38,3 +38,9 @@ id;number;parent_number;name;property;remark;status;sort_no;organization;created 37;40;TRANSACTSTATUS;完成;;;1;0;ORG001;admin;2025-03-12 10:55:26.530744;admin;2025-03-12 10:55:26.530744;0 38;50;TRANSACTSTATUS;退回;;;1;0;ORG001;admin;2025-03-12 10:56:21.730067;admin;2025-03-12 10:56:21.730067;0 39;TRANSACTSTATUS;;生产状态;;;1;0;ORG001;admin;2025-03-12 10:59:24.971458;admin;2025-03-12 10:59:24.971458;0 +40;MATGROUP0;;物料大类;;;1;0;ORG001;admin;2025-03-16 16:10:39.916246;admin;2025-03-16 16:10:39.916246;0 +41;GD;MATGROUP0;黄金;;;1;0;ORG001;admin;2025-03-16 16:14:59.151541;admin;2025-03-16 16:14:59.151541;0 +42;AG;MATGROUP0;白银;;;1;0;ORG001;admin;2025-03-16 16:28:46.755507;admin;2025-03-16 16:28:46.755507;0 +43;CU;MATGROUP0;铜料;;;1;0;ORG001;admin;2025-03-16 16:31:02.516413;admin;2025-03-16 16:31:02.516413;0 +44;PT;MATGROUP0;铂金;;;1;0;ORG001;admin;2025-03-16 16:35:54.700282;admin;2025-03-16 16:35:54.700282;0 +45;AL;MATGROUP0;补口;;;1;0;ORG001;admin;2025-03-16 16:37:08.754443;admin;2025-03-16 16:37:08.754443;0 diff --git a/src/main/webapp/app/orders/order/order-print.component.ts b/src/main/webapp/app/orders/order/order-print.component.ts index 878ca11..c7a251c 100644 --- a/src/main/webapp/app/orders/order/order-print.component.ts +++ b/src/main/webapp/app/orders/order/order-print.component.ts @@ -112,7 +112,7 @@ export default defineComponent({ type: 'html', css: ['/content/css/bootstrap.min.css', '/content/css/print-styles.css'], documentTitle: `${$t('jewpmsApp.order.detail.title')} - ${order.value.number}`, - //header: ``, + header: ``, style: '@page { size: A4; margin: 10mm; }', onPrintDialogClose: () => { alertService.showInfo($t('entity.action.printSuccess'));