From b00db10a37a617eababe52a148887bca5c38b245 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 6 Jun 2026 17:10:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(aps):=20=E6=B7=BB=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=E6=96=87=E4=BB=B6=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ApsPlanSheet 实体类中新增 apsUrl 字段用于存储排产文件路径 - 在 ApsPlanSheetBo 业务对象中添加 apsUrl 属性定义 - 更新 MyBatis 映射文件 ApsPlanSheetMapper.xml 添加字段映射 - 在 ApsPlanSheetVo 视图对象中增加 apsUrl 字段并配置 Excel 导出 - 为 deliveryWaybillDetail 查询添加按创建时间倒序排序功能 --- .../src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java | 5 +++++ .../main/java/com/klp/aps/domain/entity/ApsPlanSheet.java | 4 ++++ .../src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java | 6 ++++++ .../src/main/resources/mapper/aps/ApsPlanSheetMapper.xml | 2 ++ .../service/impl/WmsDeliveryWaybillDetailServiceImpl.java | 2 ++ 5 files changed, 19 insertions(+) diff --git a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java index 56d83fff..ec784feb 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java @@ -52,6 +52,11 @@ public class ApsPlanSheetBo extends BaseEntity { */ private String planType; + /** + * 排产文件 + */ + private String apsUrl; + /** * 排产人 */ diff --git a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java index 5824e30c..ea40ba50 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java @@ -49,6 +49,10 @@ public class ApsPlanSheet extends BaseEntity { * 排产类型 */ private String planType; + /** + * 排产文件 + */ + private String apsUrl; /** * 排产人 */ diff --git a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java index bc762926..65b9f65f 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java @@ -60,6 +60,12 @@ public class ApsPlanSheetVo { @ExcelProperty(value = "排产类型") private String planType; + /** + * 排产文件 + */ + @ExcelProperty(value = "排产文件") + private String apsUrl; + /** * 排产人 */ diff --git a/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml b/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml index b9ee4796..0f32f1ba 100644 --- a/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml +++ b/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml @@ -11,6 +11,7 @@ + @@ -27,6 +28,7 @@ s.line_name AS lineName, s.plan_code AS planCode, s.plan_type AS planType, + s.aps_url AS apsUrl, s.scheduler AS scheduler, s.remark AS masterRemark, d.remark AS detailRemark, diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java index 3275b7d9..c28ddcc9 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java @@ -184,6 +184,8 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD lqw.eq(bo.getQuantity() != null, WmsDeliveryWaybillDetail::getQuantity, bo.getQuantity()); lqw.eq(bo.getWeight() != null, WmsDeliveryWaybillDetail::getWeight, bo.getWeight()); lqw.eq(bo.getUnitPrice() != null, WmsDeliveryWaybillDetail::getUnitPrice, bo.getUnitPrice()); + // 根据创建时间倒叙 + lqw.orderByDesc(WmsDeliveryWaybillDetail::getCreateTime); return lqw; } /**