From 234ddd7037d7f4704364269e5d1ea2e40b3b6ab7 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 15:38:47 +0800
Subject: [PATCH] 钣金大表统计：增加 当前工序状态、下一工序
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java | 9 +++++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 5 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
index 6440562..c172b1d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
@@ -90,5 +90,14 @@
@Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
private String nextProcessDeparment;
+ /** 褰撳墠宸ュ簭鐘舵�� */
+ @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+ private String opStatus;
+
+ /** 涓嬩竴宸ュ簭鍚嶇О */
+ @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+ private String nextOpName;
+
+
private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
index 8abc58e..10103b4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
@@ -462,13 +462,14 @@
SXSSFCell departmentCell = dataRow.createCell(7);
departmentCell.setCellValue(plan.getDepartment());
+ /*褰撳墠宸ュ簭鐘舵��*/
SXSSFCell crtPcsStsCell = dataRow.createCell(8);
- crtPcsStsCell.setCellValue("");
+ crtPcsStsCell.setCellValue(plan.getOpStatus());
//涓嬩竴宸ュ簭
SXSSFCell nextProcessCell = dataRow.createCell(9);
- nextProcessCell.setCellValue("");
+ nextProcessCell.setCellValue(plan.getNextOpName());
//涓嬩竴宸ュ簭宸ュ簭璐熻矗浜�
SXSSFCell nextProcessDeparmentCell = dataRow.createCell(10);
--
Gitblit v1.9.3