From 002a61cd8b5a4239d357a2add1fda2c8c433cda6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 17:28:34 +0800
Subject: [PATCH] 钣金计划大表-导出功能调整
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java | 28 ++++++++++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml | 24 ++++++++++--
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java | 11 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 48 ++++++++++++++++--------
4 files changed, 91 insertions(+), 20 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 b8a3b62..6440562 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
@@ -79,5 +79,16 @@
@Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planEndDay;
+ /** 宸ュ簭鍙� */
+ @Excel(name = "宸ュ簭鍙�")
+ private String processNumber;
+
+ /** 鎵�灞為儴闂� */
+ @Excel(name = "鎵�灞為儴闂�")
+ private String department;
+ /** 涓嬮亾宸ュ簭鎵�灞為儴闂� */
+ @Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
+ private String nextProcessDeparment;
+
private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
index 3347d05..1507913 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
@@ -52,6 +52,16 @@
@Schema(description = "鍒犻櫎鏍囧織", type = "String")
private String delFlag;
+
+ /** 宸ュ簭鍙� */
+ @Excel(name = "宸ュ簭鍙�")
+ private String processNumber;
+
+ /** 宸ヤ綔涓績 */
+ @Excel(name = "宸ヤ綔涓績")
+ private String workCenter;
+
+
public void setId(Long id)
{
this.id = id;
@@ -122,6 +132,22 @@
return delFlag;
}
+
+ public String getProcessNumber() {
+ return processNumber;
+ }
+
+ public void setProcessNumber(String processNumber) {
+ this.processNumber = processNumber;
+ }
+
+ public String getWorkCenter() {
+ return workCenter;
+ }
+
+ public void setWorkCenter(String workCenter) {
+ this.workCenter = workCenter;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -136,6 +162,8 @@
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
+ .append("processNumber", getProcessNumber())
+ .append("workCenter", getWorkCenter())
.toString();
}
}
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 e665e38..0129a0a 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
@@ -192,7 +192,8 @@
stat.setDelFlag("0");
stat.setCreateBy(SecurityUtils.getUsername());
stat.setCreateTime(DateUtils.getNowDate());
-
+ stat.setWorkCenter(plan.getWorkCenter());
+ stat.setProcessNumber(plan.getProcessNumber());
try {
@@ -344,33 +345,41 @@
workCenterTitle.setCellValue("褰撳墠宸ュ簭");
workCenterTitle.setCellStyle(title);
- SXSSFCell itemNumberTitle = rowTitle.createCell(6);
+ SXSSFCell departmentTitle = rowTitle.createCell(6);
+ departmentTitle.setCellValue("褰撳墠宸ュ簭璐熻矗浜�");
+ departmentTitle.setCellStyle(title);
+
+ SXSSFCell nextProcessDeparmentTitle = rowTitle.createCell(7);
+ nextProcessDeparmentTitle.setCellValue("涓嬩竴宸ュ簭璐熻矗浜�");
+ nextProcessDeparmentTitle.setCellStyle(title);
+
+ SXSSFCell itemNumberTitle = rowTitle.createCell(8);
itemNumberTitle.setCellValue("鏂欏彿");
itemNumberTitle.setCellStyle(title);
- SXSSFCell drawingNoTitle = rowTitle.createCell(7);
+ SXSSFCell drawingNoTitle = rowTitle.createCell(9);
drawingNoTitle.setCellValue("鍥惧彿");
drawingNoTitle.setCellStyle(title);
- SXSSFCell versionNumberTitle = rowTitle.createCell(8);
+ SXSSFCell versionNumberTitle = rowTitle.createCell(10);
versionNumberTitle.setCellValue("鐗堟湰鍙�");
versionNumberTitle.setCellStyle(title);
- SXSSFCell productionQuantityTitle = rowTitle.createCell(9);
+ SXSSFCell productionQuantityTitle = rowTitle.createCell(11);
productionQuantityTitle.setCellValue("鐢熶骇鏁伴噺");
productionQuantityTitle.setCellStyle(title);
- SXSSFCell planEndDayTitle = rowTitle.createCell(10);
+ SXSSFCell planEndDayTitle = rowTitle.createCell(12);
planEndDayTitle.setCellValue("璁″垝瀹屽伐鏃�");
planEndDayTitle.setCellStyle(title);
-
+ int i1 = 13;
for (int i = 0; i < shopNames.size(); i++) {
String shopName = shopNames.get(i);
- SXSSFCell beginDateCell = rowTitle.createCell(i * 2 + 11);
- SXSSFCell endDateCell = rowTitle.createCell(i * 2 + 12);
+ SXSSFCell beginDateCell = rowTitle.createCell(i * 2 + i1);
+ SXSSFCell endDateCell = rowTitle.createCell(i * 2 + i1+1);
beginDateCell.setCellValue(shopName+"寮�宸ユ椂闂�");
endDateCell.setCellValue(shopName+"瀹屽伐鏃堕棿");
beginDateCell.setCellStyle(title);
@@ -407,30 +416,37 @@
workCenterCell.setCellValue(plan.getWorkCenter());
// workCenterCell.setCellStyle(title);
- SXSSFCell itemNumberCell = dataRow.createCell(6);
+ SXSSFCell departmentCell = dataRow.createCell(6);
+ departmentCell.setCellValue(plan.getDepartment());
+
+ SXSSFCell nextProcessDeparmentCell = dataRow.createCell(7);
+ nextProcessDeparmentCell.setCellValue(plan.getNextProcessDeparment());
+
+
+ SXSSFCell itemNumberCell = dataRow.createCell(8);
itemNumberCell.setCellValue(plan.getItemNumber());
// itemNumberCell.setCellStyle(title);
- SXSSFCell drawingNoCell = dataRow.createCell(7);
+ SXSSFCell drawingNoCell = dataRow.createCell(9);
drawingNoCell.setCellValue(plan.getDrawingNo());
// drawingNoCell.setCellStyle(title);
- SXSSFCell versionNumberCell = dataRow.createCell(8);
+ SXSSFCell versionNumberCell = dataRow.createCell(10);
versionNumberCell.setCellValue(plan.getVersionNumber());
// versionNumberCell.setCellStyle(title);
- SXSSFCell productionQuantityCell = dataRow.createCell(9);
+ SXSSFCell productionQuantityCell = dataRow.createCell(11);
productionQuantityCell.setCellValue(plan.getProductionQuantity().toString());
// productionQuantityCell.setCellStyle(title);
- SXSSFCell planEndDayCell = dataRow.createCell(10);
+ SXSSFCell planEndDayCell = dataRow.createCell(12);
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);
+ SXSSFCell beginDateCell = dataRow.createCell(j * 2 + i1);
+ SXSSFCell endDateCell = dataRow.createCell(j * 2 + i1+1);
plan.getDeptPlans().stream().filter(x->x.getShopName().equals(shopName)).findFirst().ifPresent(x->{
beginDateCell.setCellValue(x.getPlanStartDate());
endDateCell.setCellValue(x.getPlanEndDate());
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
index 3292fc1..f78c192 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
@@ -16,10 +16,15 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="processNumber" column="process_number" />
+ <result property="workCenter" column="work_center" />
+
</resultMap>
<sql id="selectApsPlateProcessShopStatVo">
- select id, doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time, update_by, update_time from aps_plate_process_shop_stat
+ select id, doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time, update_by, update_time,
+ process_number,work_center
+ from aps_plate_process_shop_stat
</sql>
<select id="selectApsPlateProcessShopStatList" parameterType="ApsPlateProcessShopStat" resultMap="ApsPlateProcessShopStatResult">
@@ -30,7 +35,10 @@
<if test="shopName != null and shopName != ''"> and shop_name = #{shopName}</if>
<if test="planStartDate != null and planStartDate != ''"> and plan_start_date = #{planStartDate}</if>
<if test="planEndDate != null and planEndDate != ''"> and plan_end_date = #{planEndDate}</if>
- and del_flag='0'
+
+ <if test="processNumber != null and processNumber != ''"> and process_number = #{processNumber}</if>
+ <if test="workCenter != null and workCenter != ''"> and work_center = #{workCenter}</if>
+ and del_flag='0'
</where>
</select>
@@ -52,6 +60,8 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
+ <if test="processNumber != null">process_number,</if>
+ <if test="workCenter != null">work_center,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="docNo != null">#{docNo},</if>
@@ -64,6 +74,8 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
+ <if test="processNumber != null">#{processNumber},</if>
+ <if test="workCenter != null">#{workCenter},</if>
</trim>
</insert>
@@ -100,7 +112,9 @@
<insert id="batchInsert" parameterType="java.util.List">
insert into aps_plate_process_shop_stat
- (doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time)
+ (doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time,
+ process_number, work_center
+ )
values
<foreach collection="list" item="item" separator=",">
(
@@ -111,7 +125,9 @@
#{item.planEndDate},
#{item.delFlag},
#{item.createBy},
- #{item.createTime}
+ #{item.createTime},
+ #{item.processNumber},
+ #{item.workCenter}
)
</foreach>
</insert>
--
Gitblit v1.9.3