From 981a50b0565bcb37d99c24a76f6eba086dc6eb21 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 20 Jun 2024 09:15:09 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E9=80=8F=E4=BC=A0=EF=BC=9A=E5=AD=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=BD=BD=E5=85=B7=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/publish/BussEventMulticaster.java | 2 +- .../task/handler/impl/GroupDickInStorageTask.java | 8 ++++++-- .../service/execution/impl/FlowOperationServiceImpl.java | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java index 1867ee56..14a5029f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java @@ -30,7 +30,7 @@ public class BussEventMulticaster implements BeanPostProcessor { if (sync){ String result= listener.doEvent(event); if (event.getCallback() !=null && result !=null){ - event.getCallback().accept(result,null); + event.getCallback().accept(result); }; }else { //TODO:异步回调 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java index 8873d2fd..0e39f592 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java @@ -77,7 +77,8 @@ public class GroupDickInStorageTask extends AbstractTask { if (execution == null){ throw new BadRequestException("申请任务失败:载具"+vehicle_code+"任务流程信息不存在"+currentInstId); } - BussEventMulticaster.Publish(new FlowContinueEvent(currentInstId,null , new JSONObject(MapOf.of("start_point", point_code1)))); + FlowContinueEvent continueEvent = new FlowContinueEvent(currentInstId, null, new JSONObject(MapOf.of("start_point", point_code1))); + BussEventMulticaster.Publish(continueEvent); }else { BussEventMulticaster.Publish( new FlowStartEvent("md_group", @@ -87,7 +88,10 @@ public class GroupDickInStorageTask extends AbstractTask { .build("md_pb_vehicleMater",item) ); } - //执行流程// + //流程创建完毕，更新组盘信息为完成 + iMdGruopDickService.update(new UpdateWrapper() + .set("status", StatusEnum.FORM_STATUS.code("完成")) + .eq("vehicle_code", vehicle_code)); } return null; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java index 4718ceb3..610291b6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java @@ -114,6 +114,10 @@ public class FlowOperationServiceImpl implements IFlowOperationService { entity.setProc_inst_id(execution.getProc_inst_id()); entity.setParent_id(execution.getParent_id()); entity.setAuxParam(execution.getAux_param()); + //手动添加扩展数据 + if (!CollectionUtils.isEmpty(auxParam)){ + entity.getAuxParam().putAll(auxParam); + } entity.setForm_type(execution.getForm_type()); entity.setForm_id(execution.getForm_id()); entity.setStartActivityId(execution.getActivity_id());