From 9f65291e746158000d43e4581cc4608b08dde3a1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 14 七月 2025 08:55:18 +0800
Subject: [PATCH] 班组产量报表添加批次字段
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java | 2 ++
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 6 ++++--
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 1 +
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index fd8a244..3d9c51e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -290,6 +290,7 @@
{
field: 'project', width: 120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
+ {field: 'batch', width: 90, title: t('order.batch')},
{
field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index 9fa23be..a6c7366 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -312,6 +312,7 @@
{field: 'childHeight', width: 120, title: t('order.height'),visible: true},
{field: 'stockNum', width: 120, title: t('productStock.inventoryQuantity'),visible: true},
{field: 'stockArea', width: 120, title: t('report.inventoryArea'),visible: true},
+ {field: 'workProcessName', width: 120, title: t('report.workProcessName')},
{field: 'productName', width: 120, title: t('order.product'),visible: true},
{field: 'bendRadius', width: 120, title: t('order.bendRadius'),visible: true},
{field: 'teamsGroupsName', width: 110,title: t('report.teamsGroupsName'),showOverflow:"ellipsis",filters: [{data: ''}],
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
index 33695c0..dd0ca32 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -47,4 +47,6 @@
private String workProcessName;
@ExcelProperty("鎶ュ伐璁惧")
private String deviceName;
+ @ExcelProperty("鎵规")
+ private String batch;
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 9eca656..a3e6861 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1353,7 +1353,8 @@
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
ELSE MAX( ogd.glass_child )
- END AS workProcessName
+ END AS workProcessName,
+ o.batch
FROM
reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
@@ -1436,7 +1437,8 @@
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
ELSE MAX( ogd.glass_child )
- END AS workProcessName
+ END AS workProcessName,
+ o.batch
FROM
reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
--
Gitblit v1.8.0