From 970c55059023eebe4528a397ad67378cbe78502e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 14 Aug 2025 15:07:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(WmsProcessTask):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E9=A1=BA=E5=BA=8F=E5=AD=97=E6=AE=B5=E5=B9=B6?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsProcessTask 和 WmsProcessTaskBo 类中添加 sequence 字段 - 在 WmsProcessTaskMapper.xml 中添加 sequence 列的映射 - 在 WmsProcessTaskServiceImpl 中按 sequence 排序任务列表 - 在 WmsProcessTaskVo 中添加 sequence 字段并支持 Excel 导出 --- klp-wms/src/main/java/com/klp/domain/WmsProcessTask.java | 3 +++ klp-wms/src/main/java/com/klp/domain/bo/WmsProcessTaskBo.java | 3 +++ klp-wms/src/main/java/com/klp/domain/vo/WmsProcessTaskVo.java | 4 ++++ .../java/com/klp/service/impl/WmsProcessTaskServiceImpl.java | 1 + .../src/main/resources/mapper/klp/WmsProcessTaskMapper.xml | 1 + 5 files changed, 12 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProcessTask.java b/klp-wms/src/main/java/com/klp/domain/WmsProcessTask.java index 34ce71e3..1b49727d 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsProcessTask.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsProcessTask.java @@ -54,4 +54,7 @@ public class WmsProcessTask extends BaseEntity { */ private String remark; + //排序字段 + private Integer sequence; + } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessTaskBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessTaskBo.java index 8d21f4ca..f7f3d273 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessTaskBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessTaskBo.java @@ -51,5 +51,8 @@ public class WmsProcessTaskBo extends BaseEntity { */ private String remark; + //工艺顺序 + private Integer sequence; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessTaskVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessTaskVo.java index ad40bda1..889114ae 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessTaskVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessTaskVo.java @@ -59,5 +59,9 @@ public class WmsProcessTaskVo { @ExcelProperty(value = "备注") private String remark; + //工艺顺序 + @ExcelProperty(value = "工艺顺序") + private Integer sequence; + } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessTaskServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessTaskServiceImpl.java index 05a77616..d98d9eb9 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessTaskServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessTaskServiceImpl.java @@ -66,6 +66,7 @@ public class WmsProcessTaskServiceImpl implements IWmsProcessTaskService { lqw.eq(bo.getProductId() != null, WmsProcessTask::getProductId, bo.getProductId()); lqw.eq(bo.getTaskQuantity() != null, WmsProcessTask::getTaskQuantity, bo.getTaskQuantity()); lqw.eq(StringUtils.isNotBlank(bo.getTaskStatus()), WmsProcessTask::getTaskStatus, bo.getTaskStatus()); + lqw.orderByAsc(WmsProcessTask::getSequence); return lqw; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProcessTaskMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProcessTaskMapper.xml index aa46a6f5..13113c8e 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsProcessTaskMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsProcessTaskMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +