From 6147ad2252cb62d89be3aa99450f004efb7dd613 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 29 May 2026 15:40:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(aps/plan):=20=E4=B8=BA=E6=8E=92=E4=BA=A7?=
=?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E=E6=8E=92=E4=BA=A7?=
=?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
在排产单明细实体、业务对象、值对象及映射文件中新增detailDate字段,用于记录排产日期(字符串格式,如'2025-12-29')。同时,在服务实现类中为查询条件添加对该字段的筛选支持,实现按排产日期过滤排产单明细的功能。
---
.../main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java | 4 ++++
.../main/java/com/klp/aps/domain/entity/ApsPlanDetail.java | 4 ++++
.../main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java | 6 ++++++
.../com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java | 2 ++
.../src/main/resources/mapper/aps/ApsPlanDetailMapper.xml | 1 +
5 files changed, 17 insertions(+)
diff --git a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java
index 3e90e266..ce8a4af9 100644
--- a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java
+++ b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java
@@ -226,5 +226,9 @@ public class ApsPlanDetailBo extends BaseEntity {
*/
private String remark;
+ /**
+ * 排产日期(字符串格式,例如 '2025-12-29')
+ */
+ private String detailDate;
}
diff --git a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java
index a1bd008a..f7629d74 100644
--- a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java
+++ b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java
@@ -184,6 +184,10 @@ public class ApsPlanDetail extends BaseEntity {
* 备注
*/
private String remark;
+ /**
+ * 排产日期(字符串格式,例如 '2025-12-29')
+ */
+ private String detailDate;
/**
* 删除标记(0正常 1删除)
*/
diff --git a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java
index dac59bae..8855d2c8 100644
--- a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java
+++ b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java
@@ -261,6 +261,12 @@ public class ApsPlanDetailVo {
@ExcelProperty(value = "备注")
private String remark;
+ /**
+ * 排产日期(字符串格式,例如 '2025-12-29')
+ */
+ @ExcelProperty(value = "排产日期")
+ private String detailDate;
+
/**
* 技术附件
*/
diff --git a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java
index 011da25f..9525ef7d 100644
--- a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java
+++ b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java
@@ -101,6 +101,7 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
qw.eq(StringUtils.isNotBlank(bo.getSampleReq()), "d.sample_req", bo.getSampleReq());
qw.eq(bo.getStartTime() != null, "d.start_time", bo.getStartTime());
qw.eq(bo.getEndTime() != null, "d.end_time", bo.getEndTime());
+ qw.eq(StringUtils.isNotBlank(bo.getDetailDate()), "d.detail_date", bo.getDetailDate());
//根据创建时间倒叙
qw.orderByDesc("d.create_time");
return qw;
@@ -168,6 +169,7 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
lqw.eq(StringUtils.isNotBlank(bo.getSampleReq()), ApsPlanDetail::getSampleReq, bo.getSampleReq());
lqw.eq(bo.getStartTime() != null, ApsPlanDetail::getStartTime, bo.getStartTime());
lqw.eq(bo.getEndTime() != null, ApsPlanDetail::getEndTime, bo.getEndTime());
+ lqw.eq(StringUtils.isNotBlank(bo.getDetailDate()), ApsPlanDetail::getDetailDate, bo.getDetailDate());
return lqw;
}
diff --git a/klp-aps/src/main/resources/mapper/aps/ApsPlanDetailMapper.xml b/klp-aps/src/main/resources/mapper/aps/ApsPlanDetailMapper.xml
index b5d6c2c4..5ac6b4ba 100644
--- a/klp-aps/src/main/resources/mapper/aps/ApsPlanDetailMapper.xml
+++ b/klp-aps/src/main/resources/mapper/aps/ApsPlanDetailMapper.xml
@@ -44,6 +44,7 @@
+