From 835dddd82e66774eff8009c21e9c6aad42d7fc37 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 16:20:50 +0800
Subject: [PATCH] 钣金计划大表-标准工序增加专业过滤
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 c627314..e665e38 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
@@ -1,5 +1,6 @@
package com.aps.core.service.impl;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -130,7 +131,7 @@
// 瀹氫箟璇ュ姛鑳戒娇鐢ㄦ暟鎹簮涓哄崡閫氱殑宸ュ巶
final String plant = "FORTUNA";
-
+ final String major="閽ｉ噾";
// 鏌ヨ鐩稿叧鏁版嵁
ApsPlatePlan platePlan = new ApsPlatePlan();
platePlan.setPlant(plant);
@@ -144,6 +145,7 @@
ApsStandardProcess process = new ApsStandardProcess();
process.setPlant(plant);
+ process.setMajor(major);
List<ApsStandardProcess> shopProcesses = standardProcessMapper.selectApsStandardProcessList(process);
if (planList.isEmpty() || shopList.isEmpty() || shopProcesses.isEmpty()) {
log.warn("璁″垝鍒楄〃銆佽溅闂村垪琛ㄦ垨宸ュ簭鍒楄〃涓虹┖锛屾棤娉曠敓鎴愮粺璁′俊鎭�");
@@ -362,6 +364,9 @@
planEndDayTitle.setCellValue("璁″垝瀹屽伐鏃�");
planEndDayTitle.setCellStyle(title);
+
+
+
for (int i = 0; i < shopNames.size(); i++) {
String shopName = shopNames.get(i);
SXSSFCell beginDateCell = rowTitle.createCell(i * 2 + 11);
@@ -371,16 +376,16 @@
beginDateCell.setCellStyle(title);
endDateCell.setCellStyle(title);
}
-
-
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (int i = 0; i < table.size(); i++) {
ApsPlateProcessShopPlanStat plan = table.get(i);
- /*鍒涘缓鏁版嵁琛�*/
+
SXSSFRow dataRow = sheet.createRow(i+1);
SXSSFCell mainPartNumberCell = dataRow.createCell(0);
- mainPartNumberTitle.setCellValue(plan.getMainPartNumber());
- //mainPartNumberTitle.setCellStyle(title);
+ mainPartNumberCell.setCellValue(plan.getMainPartNumber());
+
+ //mainPartNumberCell.setCellStyle(title);
SXSSFCell businessTypeCell= dataRow.createCell(1);
businessTypeCell.setCellValue(plan.getBusinessType());
@@ -419,9 +424,27 @@
// productionQuantityCell.setCellStyle(title);
SXSSFCell planEndDayCell = dataRow.createCell(10);
- planEndDayCell.setCellValue(plan.getPlanEndDay());
+ planEndDayCell.setCellValue(dateFormat.format(plan.getPlanEndDay()));
// planEndDayCell.setCellStyle(title);
+
+ for (int j = 0; j< shopNames.size(); j++) {
+ String shopName = shopNames.get(j);
+ SXSSFCell beginDateCell = dataRow.createCell(j * 2 + 11);
+ SXSSFCell endDateCell = dataRow.createCell(j * 2 + 12);
+ plan.getDeptPlans().stream().filter(x->x.getShopName().equals(shopName)).findFirst().ifPresent(x->{
+ beginDateCell.setCellValue(x.getPlanStartDate());
+ endDateCell.setCellValue(x.getPlanEndDate());
+ });
+ }
+
+
}
+
+ for (int i = 0; i < 24; i++) {
+
+ sheet.setColumnWidth(i, 20 * 256);
+ }
+
wb.write(response.getOutputStream());
}
catch (Exception e)
@@ -447,6 +470,10 @@
style.setFont(titleFont);
DataFormat dataFormat = wb.createDataFormat();
style.setDataFormat(dataFormat.getFormat("@"));
+
+
+
+
styles.put("title", style);
return styles;
}
--
Gitblit v1.9.3