From c9cda73c43f5914cbf57aa2d7c557d22a6cef40a Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 25 四月 2025 18:42:40 +0800
Subject: [PATCH] 定时任务-增加同步气柜数据

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java |  103 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 69 insertions(+), 34 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 0129a0a..dcd9d9c 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
@@ -319,7 +319,6 @@
             List<ApsPlateProcessShopPlanStat>  table= (List<ApsPlateProcessShopPlanStat>)stat.get("data");
             SXSSFSheet sheet = wb.getSheetAt(0);
             /*濉啓鏃ユ湡鍒� 鍜� 宸ユ椂鍒�*/
-
             SXSSFRow rowTitle = sheet.createRow(0);
             SXSSFCell mainPartNumberTitle = rowTitle.createCell(0);
             mainPartNumberTitle.setCellValue("涓讳欢鏂欏彿");
@@ -341,41 +340,61 @@
             documentStatusTitle.setCellValue("鍗曟嵁鐘舵��");
             documentStatusTitle.setCellStyle(title);
 
-            SXSSFCell workCenterTitle = rowTitle.createCell(5);
+            SXSSFCell approveDateTitle = rowTitle.createCell(5);
+            approveDateTitle.setCellValue("瀹℃牳鏃堕棿");
+            approveDateTitle.setCellStyle(title);
+
+            SXSSFCell workCenterTitle = rowTitle.createCell(6);
             workCenterTitle.setCellValue("褰撳墠宸ュ簭");
             workCenterTitle.setCellStyle(title);
 
-            SXSSFCell departmentTitle = rowTitle.createCell(6);
+            SXSSFCell departmentTitle = rowTitle.createCell(7);
             departmentTitle.setCellValue("褰撳墠宸ュ簭璐熻矗浜�");
             departmentTitle.setCellStyle(title);
 
-            SXSSFCell nextProcessDeparmentTitle = rowTitle.createCell(7);
+            SXSSFCell nextProcessTitle = rowTitle.createCell(8);
+            nextProcessTitle.setCellValue("涓嬩竴宸ュ簭");
+            nextProcessTitle.setCellStyle(title);
+
+
+            SXSSFCell nextProcessDeparmentTitle = rowTitle.createCell(9);
             nextProcessDeparmentTitle.setCellValue("涓嬩竴宸ュ簭璐熻矗浜�");
             nextProcessDeparmentTitle.setCellStyle(title);
 
-            SXSSFCell itemNumberTitle = rowTitle.createCell(8);
+            SXSSFCell itemNumberTitle = rowTitle.createCell(10);
             itemNumberTitle.setCellValue("鏂欏彿");
             itemNumberTitle.setCellStyle(title);
 
-            SXSSFCell drawingNoTitle = rowTitle.createCell(9);
+            SXSSFCell drawingNoTitle = rowTitle.createCell(11);
             drawingNoTitle.setCellValue("鍥惧彿");
             drawingNoTitle.setCellStyle(title);
 
-            SXSSFCell versionNumberTitle = rowTitle.createCell(10);
+            SXSSFCell versionNumberTitle = rowTitle.createCell(12);
             versionNumberTitle.setCellValue("鐗堟湰鍙�");
             versionNumberTitle.setCellStyle(title);
 
-            SXSSFCell productionQuantityTitle = rowTitle.createCell(11);
+            SXSSFCell lowNumTitle = rowTitle.createCell(13);
+            lowNumTitle.setCellValue("浣庨樁鐮�");
+            lowNumTitle.setCellStyle(title);
+
+
+            SXSSFCell productionQuantityTitle = rowTitle.createCell(14);
             productionQuantityTitle.setCellValue("鐢熶骇鏁伴噺");
             productionQuantityTitle.setCellStyle(title);
 
-            SXSSFCell planEndDayTitle = rowTitle.createCell(12);
-            planEndDayTitle.setCellValue("璁″垝瀹屽伐鏃�");
+            SXSSFCell planSendDateTitle = rowTitle.createCell(15);
+            planSendDateTitle.setCellValue("宸ュ崟璁″垝涓嬪彂鏃堕棿");
+            planSendDateTitle.setCellStyle(title);
+
+
+
+            SXSSFCell planEndDayTitle = rowTitle.createCell(16);
+            planEndDayTitle.setCellValue("绯荤粺瀹屽伐鏃堕棿");
             planEndDayTitle.setCellStyle(title);
 
 
 
-            int i1 = 13;
+            int i1 = 17;
             for (int i = 0; i < shopNames.size(); i++) {
                 String shopName = shopNames.get(i);
                 SXSSFCell beginDateCell = rowTitle.createCell(i * 2 + i1);
@@ -390,58 +409,74 @@
                 ApsPlateProcessShopPlanStat plan = table.get(i);
 
                 SXSSFRow dataRow  = sheet.createRow(i+1);
-
+                //涓讳欢鏂欏彿
                 SXSSFCell mainPartNumberCell = dataRow.createCell(0);
                 mainPartNumberCell.setCellValue(plan.getMainPartNumber());
 
-                //mainPartNumberCell.setCellStyle(title);
-
+                //涓氬姟绫诲瀷;
                 SXSSFCell businessTypeCell= dataRow.createCell(1);
                 businessTypeCell.setCellValue(plan.getBusinessType());
-                //businessTypeCell.setCellStyle(title);
 
+                //鍗曟嵁鍙�;
                 SXSSFCell documentNumberCell = dataRow.createCell(2);
                 documentNumberCell.setCellValue(plan.getDocumentNumber());
-               // documentNumberCell.setCellStyle(title);
 
+                //闇�姹傚垎绫�;
                 SXSSFCell requirementTypeCell = dataRow.createCell(3);
                 requirementTypeCell.setCellValue(plan.getRequirementType());
-               // requirementTypeCell.setCellStyle(title);
 
+                // 鍗曟嵁鐘舵��
                 SXSSFCell documentStatusCell = dataRow.createCell(4);
                 documentStatusCell.setCellValue(plan.getDocumentStatus());
-               // documentStatusCell.setCellStyle(title);
 
-                SXSSFCell workCenterCell = dataRow.createCell(5);
+
+                // 瀹℃牳鏃堕棿
+                SXSSFCell approveDateCell = dataRow.createCell(5);
+                approveDateCell.setCellValue("");
+
+                //褰撳墠宸ュ簭
+                SXSSFCell workCenterCell = dataRow.createCell(6);
                 workCenterCell.setCellValue(plan.getWorkCenter());
-               // workCenterCell.setCellStyle(title);
 
-                SXSSFCell departmentCell = dataRow.createCell(6);
+                //褰撳墠宸ュ簭璐熻矗浜�;
+                SXSSFCell departmentCell = dataRow.createCell(7);
                 departmentCell.setCellValue(plan.getDepartment());
 
-                SXSSFCell nextProcessDeparmentCell = dataRow.createCell(7);
+                //涓嬩竴宸ュ簭
+                SXSSFCell nextProcessCell = dataRow.createCell(8);
+                nextProcessCell.setCellValue("");
+
+                //涓嬩竴宸ュ簭宸ュ簭璐熻矗浜�
+                SXSSFCell nextProcessDeparmentCell = dataRow.createCell(9);
                 nextProcessDeparmentCell.setCellValue(plan.getNextProcessDeparment());
 
-
-                SXSSFCell itemNumberCell = dataRow.createCell(8);
+                //鏂欏彿
+                SXSSFCell itemNumberCell = dataRow.createCell(10);
                 itemNumberCell.setCellValue(plan.getItemNumber());
-               // itemNumberCell.setCellStyle(title);
 
-                SXSSFCell drawingNoCell = dataRow.createCell(9);
+                // 鍥惧彿
+                SXSSFCell drawingNoCell = dataRow.createCell(11);
                 drawingNoCell.setCellValue(plan.getDrawingNo());
-               // drawingNoCell.setCellStyle(title);
 
-                SXSSFCell versionNumberCell = dataRow.createCell(10);
+               //鐗堟湰鍙�
+                SXSSFCell versionNumberCell = dataRow.createCell(12);
                 versionNumberCell.setCellValue(plan.getVersionNumber());
-              //  versionNumberCell.setCellStyle(title);
 
-                SXSSFCell productionQuantityCell = dataRow.createCell(11);
+                //浣庨樁鐮�
+                SXSSFCell lowNumCell = dataRow.createCell(13);
+                lowNumCell.setCellValue("");
+
+                //鐢熶骇鏁伴噺
+                SXSSFCell productionQuantityCell = dataRow.createCell(14);
                 productionQuantityCell.setCellValue(plan.getProductionQuantity().toString());
-              //  productionQuantityCell.setCellStyle(title);
 
-                SXSSFCell planEndDayCell = dataRow.createCell(12);
+                //宸ュ崟璁″垝涓嬪彂鏃堕棿
+                SXSSFCell planSendDateCell = dataRow.createCell(15);
+                planSendDateCell.setCellValue("");
+
+                //绯荤粺瀹屽伐鏃堕棿
+                SXSSFCell planEndDayCell = dataRow.createCell(16);
                 planEndDayCell.setCellValue(dateFormat.format(plan.getPlanEndDay()));
-              //  planEndDayCell.setCellStyle(title);
 
                 for (int j = 0; j< shopNames.size(); j++) {
                     String shopName = shopNames.get(j);
@@ -456,7 +491,7 @@
 
             }
 
-            for (int i = 0; i < 24; i++) {
+            for (int i = 0; i <  rowTitle.getLastCellNum(); i++) {
 
                 sheet.setColumnWidth(i, 20 * 256);
             }

--
Gitblit v1.9.3