From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +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 | 84 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 22 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 dcd9d9c..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
@@ -352,50 +352,70 @@
departmentTitle.setCellValue("褰撳墠宸ュ簭璐熻矗浜�");
departmentTitle.setCellStyle(title);
- SXSSFCell nextProcessTitle = rowTitle.createCell(8);
+ SXSSFCell crtPcsStsTitle = rowTitle.createCell(8);
+ crtPcsStsTitle.setCellValue("褰撳墠宸ュ簭鐘舵��");
+ crtPcsStsTitle.setCellStyle(title);
+
+ SXSSFCell nextProcessTitle = rowTitle.createCell(9);
nextProcessTitle.setCellValue("涓嬩竴宸ュ簭");
nextProcessTitle.setCellStyle(title);
- SXSSFCell nextProcessDeparmentTitle = rowTitle.createCell(9);
+ SXSSFCell nextProcessDeparmentTitle = rowTitle.createCell(10);
nextProcessDeparmentTitle.setCellValue("涓嬩竴宸ュ簭璐熻矗浜�");
nextProcessDeparmentTitle.setCellStyle(title);
- SXSSFCell itemNumberTitle = rowTitle.createCell(10);
+ SXSSFCell itemNumberTitle = rowTitle.createCell(11);
itemNumberTitle.setCellValue("鏂欏彿");
itemNumberTitle.setCellStyle(title);
- SXSSFCell drawingNoTitle = rowTitle.createCell(11);
+ SXSSFCell drawingNoTitle = rowTitle.createCell(12);
drawingNoTitle.setCellValue("鍥惧彿");
drawingNoTitle.setCellStyle(title);
- SXSSFCell versionNumberTitle = rowTitle.createCell(12);
+ SXSSFCell versionNumberTitle = rowTitle.createCell(13);
versionNumberTitle.setCellValue("鐗堟湰鍙�");
versionNumberTitle.setCellStyle(title);
- SXSSFCell lowNumTitle = rowTitle.createCell(13);
+ SXSSFCell lowNumTitle = rowTitle.createCell(14);
lowNumTitle.setCellValue("浣庨樁鐮�");
lowNumTitle.setCellStyle(title);
- SXSSFCell productionQuantityTitle = rowTitle.createCell(14);
+ SXSSFCell productionQuantityTitle = rowTitle.createCell(15);
productionQuantityTitle.setCellValue("鐢熶骇鏁伴噺");
productionQuantityTitle.setCellStyle(title);
- SXSSFCell planSendDateTitle = rowTitle.createCell(15);
+ SXSSFCell planSendDateTitle = rowTitle.createCell(16);
planSendDateTitle.setCellValue("宸ュ崟璁″垝涓嬪彂鏃堕棿");
planSendDateTitle.setCellStyle(title);
- SXSSFCell planEndDayTitle = rowTitle.createCell(16);
+ SXSSFCell planEndDayTitle = rowTitle.createCell(17);
planEndDayTitle.setCellValue("绯荤粺瀹屽伐鏃堕棿");
planEndDayTitle.setCellStyle(title);
- int i1 = 17;
- for (int i = 0; i < shopNames.size(); i++) {
+
+
+ String firstShopName = shopNames.get(0);
+ SXSSFCell firstShopBeginDateTitle = rowTitle.createCell(18);
+ firstShopBeginDateTitle.setCellValue(firstShopName+"寮�宸ユ椂闂�");
+ firstShopBeginDateTitle.setCellStyle(title);
+ SXSSFCell firstShopEndDateTitle = rowTitle.createCell(19);
+ firstShopEndDateTitle.setCellValue(firstShopName+"瀹屽伐鏃堕棿");
+ firstShopEndDateTitle.setCellStyle(title);
+
+ /*鐒婃帴浠堕綈濂�*/
+ SXSSFCell hanJieQiTaoTitle= rowTitle.createCell(20);
+ hanJieQiTaoTitle.setCellValue("鐒婃帴浠堕綈濂楀紑濮嬫椂闂�");
+ hanJieQiTaoTitle.setCellStyle(title);
+
+ int i1 = 19;
+
+ for (int i = 1; i < shopNames.size(); i++) {
String shopName = shopNames.get(i);
SXSSFCell beginDateCell = rowTitle.createCell(i * 2 + i1);
SXSSFCell endDateCell = rowTitle.createCell(i * 2 + i1+1);
@@ -442,43 +462,63 @@
SXSSFCell departmentCell = dataRow.createCell(7);
departmentCell.setCellValue(plan.getDepartment());
+ /*褰撳墠宸ュ簭鐘舵��*/
+ SXSSFCell crtPcsStsCell = dataRow.createCell(8);
+ crtPcsStsCell.setCellValue(plan.getOpStatus());
+
+
//涓嬩竴宸ュ簭
- SXSSFCell nextProcessCell = dataRow.createCell(8);
- nextProcessCell.setCellValue("");
+ SXSSFCell nextProcessCell = dataRow.createCell(9);
+ nextProcessCell.setCellValue(plan.getNextOpName());
//涓嬩竴宸ュ簭宸ュ簭璐熻矗浜�
- SXSSFCell nextProcessDeparmentCell = dataRow.createCell(9);
+ SXSSFCell nextProcessDeparmentCell = dataRow.createCell(10);
nextProcessDeparmentCell.setCellValue(plan.getNextProcessDeparment());
//鏂欏彿
- SXSSFCell itemNumberCell = dataRow.createCell(10);
+ SXSSFCell itemNumberCell = dataRow.createCell(11);
itemNumberCell.setCellValue(plan.getItemNumber());
// 鍥惧彿
- SXSSFCell drawingNoCell = dataRow.createCell(11);
+ SXSSFCell drawingNoCell = dataRow.createCell(12);
drawingNoCell.setCellValue(plan.getDrawingNo());
//鐗堟湰鍙�
- SXSSFCell versionNumberCell = dataRow.createCell(12);
+ SXSSFCell versionNumberCell = dataRow.createCell(13);
versionNumberCell.setCellValue(plan.getVersionNumber());
//浣庨樁鐮�
- SXSSFCell lowNumCell = dataRow.createCell(13);
+ SXSSFCell lowNumCell = dataRow.createCell(14);
lowNumCell.setCellValue("");
//鐢熶骇鏁伴噺
- SXSSFCell productionQuantityCell = dataRow.createCell(14);
+ SXSSFCell productionQuantityCell = dataRow.createCell(15);
productionQuantityCell.setCellValue(plan.getProductionQuantity().toString());
//宸ュ崟璁″垝涓嬪彂鏃堕棿
- SXSSFCell planSendDateCell = dataRow.createCell(15);
+ SXSSFCell planSendDateCell = dataRow.createCell(16);
planSendDateCell.setCellValue("");
//绯荤粺瀹屽伐鏃堕棿
- SXSSFCell planEndDayCell = dataRow.createCell(16);
+ SXSSFCell planEndDayCell = dataRow.createCell(17);
planEndDayCell.setCellValue(dateFormat.format(plan.getPlanEndDay()));
- for (int j = 0; j< shopNames.size(); j++) {
+
+
+
+ SXSSFCell firstShopBeginDateCell = dataRow.createCell(18);
+ SXSSFCell firstShopEndDateCell = dataRow.createCell(19);
+
+ plan.getDeptPlans().stream().filter(x->x.getShopName().equals(firstShopName)).findFirst().ifPresent(x->{
+ firstShopBeginDateCell.setCellValue(x.getPlanStartDate());
+ firstShopEndDateCell.setCellValue(x.getPlanEndDate());
+ });
+ /*鐒婃帴浠堕綈濂�*/
+ SXSSFCell hanJieQiTaoCell = dataRow.createCell(20);
+ hanJieQiTaoCell.setCellValue("");
+
+
+ for (int j = 1; j< shopNames.size(); j++) {
String shopName = shopNames.get(j);
SXSSFCell beginDateCell = dataRow.createCell(j * 2 + i1);
SXSSFCell endDateCell = dataRow.createCell(j * 2 + i1+1);
--
Gitblit v1.9.3