From 448220f72c3d6179f03f00c1f597197bc300f0e6 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 6 Jun 2024 20:46:04 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/node/base/impl/EventEntity.java | 13 +++++++++++++ .../entity/node/base/impl/FlowElement.java | 3 --- .../framework/entity/node/base/impl/FlowNode.java | 3 +++ ...ndler.java => StorageChangesProcessHandler.java} | 8 +++++++- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/EventEntity.java rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/{FinishTaskProcessHandler.java => StorageChangesProcessHandler.java} (86%) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/EventEntity.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/EventEntity.java new file mode 100644 index 00000000..cfc6f2bb --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/EventEntity.java @@ -0,0 +1,13 @@ +package org.nl.wms.flow_manage.flow.framework.entity.node.base.impl; + +import com.alibaba.fastjson.JSONObject; + +/* + * @author ZZQ + * @Date 2024/6/6 17:21 + */ +public class EventEntity { + private Boolean pre; + private String eventType; + private JSONObject eventParams; +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowElement.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowElement.java index ee58c2f6..fc7b673e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowElement.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowElement.java @@ -27,9 +27,6 @@ public abstract class FlowElement extends BaseElement { /** * 是否自动触发下个节点 */ - - protected List executionListeners = new ArrayList<>(); - // protected FlowElementsContainer parentContainer; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowNode.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowNode.java index 6717fba8..0b73a7f0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowNode.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/base/impl/FlowNode.java @@ -18,6 +18,9 @@ public abstract class FlowNode extends FlowElement { private String documentation; //监听器配置暂时不需要 private List executionListeners = new ArrayList<>(); + //事件触发器 + private List executionEvents = new ArrayList<>(); + private boolean asynchronous; private boolean asynchronousLeave; private boolean notExclusive; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/FinishTaskProcessHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java similarity index 86% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/FinishTaskProcessHandler.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java index 6f0263f6..ace4d0fd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/FinishTaskProcessHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java @@ -3,6 +3,8 @@ package org.nl.wms.flow_manage.flow.service.classprocessimpl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.utils.SecurityUtils; @@ -24,7 +26,7 @@ import java.util.List; * @Date 2024/5/6 14:34 */ @Service -public class FinishTaskProcessHandler implements ClassProcess { +public class StorageChangesProcessHandler implements ClassProcess { @Autowired private ISchBaseTaskService schBaseTaskService; @@ -38,6 +40,10 @@ public class FinishTaskProcessHandler implements ClassProcess { from.put("status",param.getString("status")); from.put("update_time",DateUtil.now()); from.put("update_name",SecurityUtils.getCurrentNickName()); + String vehicle_code = from.getString("vehicle_code"); + if (StringUtils.isEmpty(vehicle_code)){ + throw new BadRequestException("库存变动失败：请求参数载具编码不能为空"); + } SchBaseTask schBaseTask = from.toJavaObject(SchBaseTask.class); schBaseTaskService.updateById(schBaseTask);