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"
+