From 7e9f52d7dbf0806920c549e6c30fc2192bdf30a3 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 6 Jun 2024 16:27:44 +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 --- .../main/java/org/nl/common/utils/MapOf.java | 2 +- .../config/mybatis/AlmEarlyInterceptor.java | 4 +- .../nl/config/mybatis/MybatisPlusConfig.java | 8 +- .../applyTask/impl/ApplyFlowTask.java | 7 +- .../task/handler/TaskHandler.java | 16 ---- .../task/handler/impl/AgvTaskHandler.java | 18 ----- .../dao/mapper/xml/SchBaseTaskMapper.xml | 2 +- .../impl/SubProcessActivityBehavior.java | 11 ++- .../CreateTaskProcessHandler.java | 78 +++++++++++++++++++ .../FinishTaskProcessHandler.java} | 6 +- .../OutStorageTaskHandler.java | 16 +++- .../StackingTaskHandler.java | 18 +++-- .../monitor/event/FlowStartEvent.java | 2 +- .../service/impl/MdGruopDickServiceImpl.java | 3 + .../service/dao/MdPbVehicleMater.java | 13 ++++ .../controller/StIvtIostorinvController.java | 6 ++ .../StIvtIostorinvOutController.java | 2 +- .../io/service/dto/StorInvQuery.java | 1 + .../impl/StIvtIostorinvServiceImpl.java | 22 ++---- .../views/wms/dispatch_manage/task/index.vue | 12 +-- .../act/execution/curdExecution.js | 2 +- .../qd/src/views/wms/stor_manage/in/index.vue | 10 +-- .../src/views/wms/stor_manage/in/storinvin.js | 44 ++--------- .../views/wms/stor_manage/out/AddDialog.vue | 26 +++++-- .../src/views/wms/stor_manage/out/index.vue | 3 + 25 files changed, 198 insertions(+), 134 deletions(-) delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/TaskHandler.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/AgvTaskHandler.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/CreateTaskProcessHandler.java rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/{dispatch_manage/task/handler/impl/TaskStatusHandler.java => flow_manage/flow/service/classprocessimpl/FinishTaskProcessHandler.java} (91%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/{dispatch_manage/task/handler/impl => flow_manage/flow/service/classprocessimpl}/OutStorageTaskHandler.java (81%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/{dispatch_manage/task/handler/impl => flow_manage/flow/service/classprocessimpl}/StackingTaskHandler.java (79%) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java index 6b95f795..2e0a06d8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java @@ -20,7 +20,7 @@ public class MapOf implements Serializable { } public static HashMap push(Map...item){ HashMap map = new HashMap<>(); - for (int i = 0; i < (item.length & ~1); i=i+2) { + for (int i = 0; i < (item.length & ~1); i=i+1) { map.putAll(item[i]); } return map; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/AlmEarlyInterceptor.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/AlmEarlyInterceptor.java index f55675f4..9410fc32 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/AlmEarlyInterceptor.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/AlmEarlyInterceptor.java @@ -53,8 +53,8 @@ public class AlmEarlyInterceptor implements Interceptor { Field field = param1.getClass().getDeclaredField(fieldName); field.setAccessible(true); return (String) field.get(param1); - } catch (NoSuchFieldException | IllegalAccessException e) { - e.printStackTrace(); + } catch (Exception ex) { + ex.printStackTrace(); } } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index 34ad3765..3fc62275 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -46,10 +46,10 @@ public class MybatisPlusConfig { return configuration -> configuration.addInterceptor(new PageInterceptor()); } - @Bean - public Interceptor datazhuazhuaInterceptor() { - return new AlmEarlyInterceptor(); - } +// @Bean +// public Interceptor datazhuazhuaInterceptor() { +// return new AlmEarlyInterceptor(); +// } @PostConstruct public void datainnit() { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java index f07006bc..a59e8c50 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java @@ -3,6 +3,7 @@ package org.nl.wms.decision_manage.applyTask.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.exception.BadRequestException; @@ -21,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; +import java.util.function.Consumer; /** @@ -58,8 +60,11 @@ public class ApplyFlowTask extends AbstractApplyTask { } JSONObject mstJ = (JSONObject) JSONObject.toJSON(mst); mstJ.put("stor_code",item.get(0).getStor_code()); + //更新载具proc_inst_id BussEventMulticaster.Publish( - new FlowStartEvent("md_group",null,new JSONObject(MapOf.of("start_point",point_code1))) + new FlowStartEvent("md_group", + proc_inst_id -> iMdPbVehicleMaterService.update(new UpdateWrapper().set("proc_inst_id",proc_inst_id).eq("vehicle_code",vehicle_code)) + ,new JSONObject(MapOf.of("target_point", point_code1))) .build("md_group_dick",mst.getId(),mst.getSource_form_type(),mst.getSource_form_id(), mstJ) .build("md_pb_vehicleMater",item) ); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/TaskHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/TaskHandler.java deleted file mode 100644 index 29a88ae1..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/TaskHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.dispatch_manage.task.handler; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; -import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.process.classprocess.ClassProcess; - -import java.util.List; - -/* - * @author ZZQ - * @Date 2024/5/6 14:35 - */ -public interface TaskHandler extends ClassProcess { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/AgvTaskHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/AgvTaskHandler.java deleted file mode 100644 index efabf99b..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/AgvTaskHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.nl.wms.dispatch_manage.task.handler.impl; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.dispatch_manage.task.handler.TaskHandler; -import org.springframework.stereotype.Service; - -/* - * @author ZZQ - * @Date 2024/5/6 14:34 - */ -@Service -public class AgvTaskHandler implements TaskHandler { - - @Override - public JSONObject process(JSONObject from, JSONObject param) { - return null; - } -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml index ff83d580..244e87e2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml @@ -55,7 +55,7 @@ md_pb_vehicleMater LEFT JOIN st_ivt_structattr ON md_pb_vehicleMater.vehicle_code = st_ivt_structattr.vehicle_code LEFT JOIN md_me_materialbase ON md_pb_vehicleMater.material_id = md_me_materialbase.material_id - LEFT JOIN sch_base_task ON (md_pb_vehicleMater.vehicle_code = sch_base_task.vehicle_code ) + LEFT JOIN sch_base_task ON (md_pb_vehicleMater.vehicle_code = sch_base_task.vehicle_code and md_pb_vehicleMater.task_code = sch_base_task.task_code ) where md_pb_vehicleMater.vehicle_code in #{vehicle_code} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java index 2b7aa0a5..9a47ec91 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java @@ -29,6 +29,7 @@ import org.springframework.util.CollectionUtils; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -64,6 +65,7 @@ public class SubProcessActivityBehavior extends FlowNodeActivityBehavior subList = new ArrayList<>(); + Map tmpMap = new HashMap<>(); for (int i = 0; i < items.size(); i++) { JSONObject item = items.getJSONObject(i); JSONObject t = (JSONObject)item.remove("t"); @@ -73,10 +75,15 @@ public class SubProcessActivityBehavior extends FlowNodeActivityBehavior) o -> CompletableFuture.runAsync(() -> { + tmpMap.values().stream().map((Function) o -> CompletableFuture.runAsync(() -> { ExecutionEntity subEntity = new ExecutionEntity(); subEntity.setParent_id(entity.getProc_inst_id()); subEntity.setForm_id(entity.getForm_id()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/CreateTaskProcessHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/CreateTaskProcessHandler.java new file mode 100644 index 00000000..4816a0dd --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/CreateTaskProcessHandler.java @@ -0,0 +1,78 @@ +package org.nl.wms.flow_manage.flow.service.classprocessimpl; + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.domain.exception.BadRequestException; +import org.nl.common.enums.StatusEnum; +import org.nl.common.utils.CodeUtil; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; +import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.process.classprocess.ClassProcess; +import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.stream.Collectors; + +/* + * @author ZZQ + * @Date 2024/5/6 14:34 + * 堆垛机入库任务 + */ +@Service +public class CreateTaskProcessHandler implements ClassProcess { + + @Autowired + ISchBaseTaskService taskService; + + @Autowired + IMdPbVehicleMaterService iMdPbVehicleMaterService; + + @Override + @Transactional + public JSONObject process(JSONObject from, JSONObject param) { + //区分出库还是入库 + String vehicle_code = from.getString("vehicle_code"); + String struct_code = from.getString("struct_code"); + String target_point = param.getString("target_point"); + String task_type = param.getString("task_type"); + if (StringUtils.isEmpty(vehicle_code) ||StringUtils.isEmpty(target_point)||StringUtils.isEmpty(struct_code)){ + throw new BadRequestException("创建任务失败:方法请求参数不能为空"); + } + List list = taskService.list(new QueryWrapper().eq("vehicle_code", vehicle_code) + .ne("status", StatusEnum.FORM_STATUS.code("完成"))); + if (!CollectionUtils.isEmpty(list)){ + throw new BadRequestException("当前载具存在任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(","))); + } + //根据不同的任务类型调用不同的任务创建逻辑 + SchBaseTask task = new SchBaseTask(); + task.setId(IdUtil.getStringId()); + task.setSource_form_id(from.getString("id")); + task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); + task.setStatus(StatusEnum.FORM_STATUS.code("生成")); + task.setHandle_class(this.getClass().getName()); + task.setAcs_type(""); + task.setCreate_time(DateUtil.now()); + task.setCreate_name(SecurityUtils.getCurrentNickName()); + task.setTask_type(param.getString("task_type")); + task.setVehicle_code(vehicle_code); + task.setPoint_code1(target_point); + task.setPoint_code2(struct_code); + taskService.create(task); + iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() + .set(MdPbVehicleMater::getTask_code,task.getTask_code()) + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + + return (JSONObject)JSON.toJSON(task); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/FinishTaskProcessHandler.java similarity index 91% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/FinishTaskProcessHandler.java index 5ac2d4b3..6f0263f6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/FinishTaskProcessHandler.java @@ -1,4 +1,4 @@ -package org.nl.wms.dispatch_manage.task.handler.impl; +package org.nl.wms.flow_manage.flow.service.classprocessimpl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; @@ -9,7 +9,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.wms.dispatch_manage.task.handler.StructEvent; -import org.nl.wms.dispatch_manage.task.handler.TaskHandler; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.process.classprocess.ClassProcess; import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; @@ -24,7 +24,7 @@ import java.util.List; * @Date 2024/5/6 14:34 */ @Service -public class TaskStatusHandler implements TaskHandler { +public class FinishTaskProcessHandler implements ClassProcess { @Autowired private ISchBaseTaskService schBaseTaskService; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTaskHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/OutStorageTaskHandler.java similarity index 81% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTaskHandler.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/OutStorageTaskHandler.java index a62b5565..8d13d35c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTaskHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/OutStorageTaskHandler.java @@ -1,24 +1,28 @@ -package org.nl.wms.dispatch_manage.task.handler.impl; +package org.nl.wms.flow_manage.flow.service.classprocessimpl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.wms.dispatch_manage.task.handler.TaskHandler; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.process.classprocess.ClassProcess; import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; +import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater; import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService; import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; import org.nl.wms.system_manage.service.param.ISysParamService; import org.nl.wms.system_manage.service.param.dao.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.List; @@ -30,7 +34,7 @@ import java.util.stream.Collectors; * 出库任务入库任务 */ @Service -public class OutStorageTaskHandler implements TaskHandler { +public class OutStorageTaskHandler implements ClassProcess { @Autowired private ISchBaseTaskService taskService; @@ -39,8 +43,11 @@ public class OutStorageTaskHandler implements TaskHandler { @Autowired private IStIvtStructattrService iStIvtStructattrService; + @Autowired + private IMdPbVehicleMaterService iMdPbVehicleMaterService; @Override + @Transactional public JSONObject process(JSONObject from, JSONObject param) { //区分出库还是入库 //根据不同的仓位设置不同的终点 @@ -75,6 +82,9 @@ public class OutStorageTaskHandler implements TaskHandler { task.setPoint_code1(struct_code); task.setPoint_code2(end_point); taskService.save(task); + iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() + .set(MdPbVehicleMater::getTask_code,task.getTask_code()) + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); Boolean isSend = param.getBoolean("is_send"); if (isSend){ //参数封装，调acs接口 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StackingTaskHandler.java similarity index 79% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StackingTaskHandler.java index db2c9c2a..77306f53 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StackingTaskHandler.java @@ -1,9 +1,10 @@ -package org.nl.wms.dispatch_manage.task.handler.impl; +package org.nl.wms.flow_manage.flow.service.classprocessimpl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; @@ -11,12 +12,14 @@ import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.wms.dispatch_manage.task.handler.TaskHandler; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.process.classprocess.ClassProcess; import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.List; @@ -28,7 +31,7 @@ import java.util.stream.Collectors; * 堆垛机入库任务 */ @Service -public class StackingTaskHandler implements TaskHandler { +public class StackingTaskHandler implements ClassProcess { @Autowired ISchBaseTaskService taskService; @@ -37,6 +40,7 @@ public class StackingTaskHandler implements TaskHandler { IMdPbVehicleMaterService iMdPbVehicleMaterService; @Override + @Transactional public JSONObject process(JSONObject from, JSONObject param) { //区分出库还是入库 String vehicle_code = from.getString("vehicle_code"); @@ -64,10 +68,10 @@ public class StackingTaskHandler implements TaskHandler { task.setPoint_code1(start_point); task.setPoint_code2(struct_code); taskService.create(task); - Boolean isSend = param.getBoolean("is_send"); - if (isSend){ - //参数封装，调acs接口 - } + iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() + .set(MdPbVehicleMater::getTask_code,task.getTask_code()) + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + return (JSONObject)JSON.toJSON(task); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java index f3df1e39..43646ffe 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java @@ -59,7 +59,7 @@ public class FlowStartEvent extends PublishEvent { List item =new ArrayList(); for (Z z : datas) { JSONObject data = (JSONObject)JSONObject.toJSON(z); - String form_id = (String)data.getString("form_id"); + String form_id = (String)data.getString("id"); String source_form_id = (String)data.getString("source_form_id"); String source_form_type = (String)data.getString("source_form_type"); ExecutionDto build = ExecutionDto.builder() diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java index 9f02f657..41df45bd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java @@ -94,6 +94,9 @@ public class MdGruopDickServiceImpl extends ServiceImpl(HttpStatus.OK); } + @PostMapping("/taskOpen") + @Log("任务下发") + public ResponseEntity taskOpen(@RequestBody JSONObject form) { + iStIvtIostorinvService.taskOpen(form); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java index 43bfb9e6..b2e8aa5c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java @@ -27,7 +27,7 @@ import java.util.Map; * @since 2024-03-28 */ @RestController -@RequestMapping("api/stIvtIostorinvout") +@RequestMapping("api/stIvtIostorinvOut") public class StIvtIostorinvOutController { @Autowired diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java index 785e2dfc..95c6f328 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java @@ -14,6 +14,7 @@ public class StorInvQuery extends BaseQuery{ private String code; private String status; private String bill_type; + private Boolean in_storage; private String product_code; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java index 46aaf57e..27856dd7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java @@ -128,7 +128,6 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl collect = vehicleMaters.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.toSet()); @@ -226,19 +228,11 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl dtls = iStIvtIostorinvDtlService.list(new QueryWrapper().eq("inv_id", iostorinv.getId())); - List dtlJson = new ArrayList<>(); - if (!CollectionUtils.isEmpty(dtls)){ - for (StIvtIostorinvdtl dtl : dtls) { - dtlJson.add(MapOf.of("form_id",dtl.getId() - ,"t",JSONObject.toJSON(dtl) - ,"source_form_type",dtl.getSource_form_type() - ,"source_form_id",dtl.getSource_form_id())); - } - } - BussEventMulticaster.Publish(new FlowStartEvent("st_ivt_iostorinv_out", null,null) - .build("st_ivt_iostorinv_out",iostorinv.getId(),iostorinv.getSource_form_type(),iostorinv.getSource_form_id(),form) - .build("st_ivt_iostorinvdtl_out",dtlJson) - ,true); + + BussEventMulticaster.Publish(new FlowStartEvent("st_ivt_iostorinv_"+(iostorinv.getIn_storage()?"in":"out"), null,null) + .build("st_ivt_iostorinv",iostorinv.getId(),iostorinv.getSource_form_type(),iostorinv.getSource_form_id(),form) + .build("st_ivt_iostorinvdtl",dtls) + ); this.update(new UpdateWrapper() .set("status",StatusEnum.FORM_STATUS.code("执行中")) diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue index 5f3a516c..185fc45e 100644 --- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue @@ -63,7 +63,7 @@ @change="handTaskStatus" > { - this.taskStatusList = res - }) - }, - getStatusName(code) { - const status = this.taskStatusList.find(item => item.code === code) - return status ? status.name : '-' - }, doOperate(row, command) { let method_name = '' switch (command) { diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js b/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js index c60174ad..ad6cc578 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js @@ -17,7 +17,7 @@ export function getDtl(proc_inst_id) { export function del(ids) { return request({ - url: 'api/flow', + url: 'api/bpmnExecution', method: 'delete', data: ids }) diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/index.vue b/wms_pro/qd/src/views/wms/stor_manage/in/index.vue index 5a95afa8..37a140bf 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/index.vue @@ -169,7 +169,7 @@