From 4a9d811592217ef9c5093f279cf3aa5bf78ed5b6 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 30 Jun 2026 09:16:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=9C=A8=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在排产单表格中添加工序类型列显示 - 在编辑表单中增加工序类型输入字段 - 在合并表单中添加工序类型字段配置 - 在后端实体类SchProdScheduleItem中新增actionType属性 - 在业务对象SchProdScheduleItemBo中添加actionType字段 - 在查询条件中加入工序类型过滤功能 - 在视图对象SchProdScheduleItemVo中添加工序类型映射 - 更新表单初始化时工序类型数据的处理逻辑 --- .../klp/flow/domain/SchProdScheduleItem.java | 4 ++ .../flow/domain/bo/SchProdScheduleItemBo.java | 5 +++ .../flow/domain/vo/SchProdScheduleItemVo.java | 6 +++ .../impl/SchProdScheduleItemServiceImpl.java | 2 + klp-ui/src/views/wms/post/aps/schedule.vue | 43 ++++++++++++------- 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java b/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java index f888ece07..ef0cf17e2 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java @@ -131,6 +131,10 @@ public class SchProdScheduleItem extends BaseEntity { * 排产明细关联主表ID（逗号分隔，未合并存单值，合并后存多个） */ private String scheduleDetailIds; + /** + * 工序类型 + */ + private String actionType; /** * 规格 例：1.0X1250 */ diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java index c2fbd5f3f..64a8d0799 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java @@ -158,6 +158,11 @@ public class SchProdScheduleItemBo extends BaseEntity { */ private String scheduleDetailIds; + /** + * 工序类型 + */ + private String actionType; + /** * 规格 例：1.0X1250 */ diff --git a/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java index 6adfeb3a5..1dc7f0001 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java @@ -189,6 +189,12 @@ public class SchProdScheduleItemVo { @ExcelProperty(value = "排产明细关联主表ID") private String scheduleDetailIds; + /** + * 工序类型 + */ + @ExcelProperty(value = "工序类型") + private String actionType; + /** * 规格 例：1.0X1250 */ diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java index dee39cfb3..1254fffeb 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java @@ -108,6 +108,8 @@ public class SchProdScheduleItemServiceImpl implements ISchProdScheduleItemServi lqw.eq(bo.getScheduleWeight() != null, SchProdScheduleItem::getScheduleWeight, bo.getScheduleWeight()); lqw.eq(StringUtils.isNotBlank(bo.getProductItem()), SchProdScheduleItem::getProductItem, bo.getProductItem()); lqw.eq(StringUtils.isNotBlank(bo.getRowRemark()), SchProdScheduleItem::getRowRemark, bo.getRowRemark()); + // actionType + lqw.eq(StringUtils.isNotBlank(bo.getActionType()), SchProdScheduleItem::getActionType, bo.getActionType()); return lqw; } diff --git a/klp-ui/src/views/wms/post/aps/schedule.vue b/klp-ui/src/views/wms/post/aps/schedule.vue index 726abd298..6ff6398ec 100644 --- a/klp-ui/src/views/wms/post/aps/schedule.vue +++ b/klp-ui/src/views/wms/post/aps/schedule.vue @@ -205,6 +205,7 @@ +