From 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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