From f51ee0cb6954dab235621428707bcbe418358c96 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 24 Apr 2026 14:39:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B9=E9=80=A0-=E5=88=86=E5=88=87?= =?UTF-8?q?=E4=B8=8B=E5=8D=B7/=E4=B8=8A=E8=BD=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/UpShaftTrussNewTask.java | 263 ++++++++++++++++++ .../tasks/slitter/constant/SlitterEnum.java | 2 +- .../tasks/slitter/mapper/SlitterMapper.java | 2 + .../tasks/slitter/mapper/SlitterMapper.xml | 35 +++ .../service/impl/SlitterServiceImpl.java | 188 ++++++++++--- 5 files changed, 445 insertions(+), 45 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussNewTask.java diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussNewTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussNewTask.java new file mode 100644 index 000000000..99ce563df --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussNewTask.java @@ -0,0 +1,263 @@ +package org.nl.b_lms.sch.tasks.slitter; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; +import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; +import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; +import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService; +import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; +import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.common.utils.TaskUtils; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.pdm.ivt.deliverycache.service.IDeliverycachepointivtService; +import org.nl.wms.pdm.ivt.deliverycache.service.dao.Deliverycachepointivt; +import org.nl.wms.sch.AcsTaskDto; +import org.nl.wms.sch.manage.AbstractAcsTask; +import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 新的上轴任务 + * @Author: liyongde + * @Date: 2026/4/24 14:21 + */ +@Slf4j +@Service +public class UpShaftTrussNewTask extends AbstractAcsTask { + private final String THIS_CLASS = UpShaftTrussNewTask.class.getName(); + @Autowired + private IschBaseTaskService taskService; + @Autowired + private IPdmBiSlittingproductionplanService slittingproductionplanService; + @Autowired + private IBstIvtCutpointivtService bcutpointivtService; + @Autowired + private IstIvtCutpointivtService cutpointivtService; + @Autowired + private IDeliverycachepointivtService deliverycachepointivtService; + + @Override + public List addTask() { + /* + * 下发给ACS时需要特殊处理 + */ + ArrayList resultList = new ArrayList<>(); + String agv_system_type = "2"; + List taskList = taskService.getIssueTasks(THIS_CLASS); + for (SchBaseTask task : taskList) { + String requestParam = task.getRequest_param(); + JSONObject requestParamObj = JSONObject.parseObject(requestParam); + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(task.getTask_id()) + .task_code(task.getTask_code()) + .task_type(task.getAcs_task_type()) + .start_device_code(task.getPoint_code1()) + .next_device_code(task.getPoint_code2()) + .start_device_code2(task.getPoint_code3()) + .next_device_code2(task.getPoint_code4()) + .vehicle_code(task.getVehicle_code()) + .agv_system_type(agv_system_type) + .truss_type(requestParamObj.getString("truss_type")) + .empty_site(requestParamObj.getString("empty_site")) + .priority(task.getPriority()) + .remark(task.getRemark()) + .product_area(task.getProduct_area()) + .build(); + resultList.add(dto); + } + return resultList; + } + + /** + * 单任务下发，业务逻辑与无参 addTask 保持一致 + */ + @Override + public List addTask(SchBaseTask task) { + ArrayList resultList = new ArrayList<>(); + String agv_system_type = "2"; + if (task != null) { + String requestParam = task.getRequest_param(); + JSONObject requestParamObj = JSONObject.parseObject(requestParam); + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(task.getTask_id()) + .task_code(task.getTask_code()) + .task_type(task.getAcs_task_type()) + .start_device_code(task.getPoint_code1()) + .next_device_code(task.getPoint_code2()) + .start_device_code2(task.getPoint_code3()) + .next_device_code2(task.getPoint_code4()) + .vehicle_code(task.getVehicle_code()) + .agv_system_type(agv_system_type) + .truss_type(requestParamObj.getString("truss_type")) + .empty_site(requestParamObj.getString("empty_site")) + .priority(task.getPriority()) + .remark(task.getRemark()) + .product_area(task.getProduct_area()) + .build(); + resultList.add(dto); + } + return resultList; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateTaskStatus(JSONObject taskObj, String status) { + SchBaseTask task = taskService.getById(taskObj.getString("task_id")); + if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { + // 更新任务状态为执行中 + task.setTask_status(TaskStatusEnum.EXECUTING.getCode()); + } + + if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { + task.setTask_status(TaskStatusEnum.FINISHED.getCode()); + // 点位内容更新 + // 1是缓存架位，2是分切机下料位 + String pointCode1 = task.getPoint_code1(); + Deliverycachepointivt point1 = deliverycachepointivtService.getOneByPointCode(pointCode1, false); + String pointCode2 = task.getPoint_code2(); + StIvtCutpointivt point2 = cutpointivtService.getPintByUpOrDownCode(pointCode2, false); + // 可能不存在 + String pointCode3 = task.getPoint_code1(); + Deliverycachepointivt point3 = deliverycachepointivtService.getOneByPointCode(pointCode3, false); + + // 交换数据 + point2.setUp_qzzno(task.getVehicle_code()); + point2.setDown_qzzno(task.getVehicle_code2()); + point2.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + point2.setUpdate_optname(SecurityUtils.getCurrentUsername()); + point2.setUpdate_time(DateUtil.now()); + + + // 分切计划修改状态04->05 + List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) + .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); + List plans = slittingproductionplanService.getByQzzNos(collect); + PdmBiSlittingproductionplan pp = plans.get(0); + String weightStr = SlitterTaskUtil.getPaperWeightStr(plans); + if (pp.getContainer_name().contains("虚拟")) { + // 如果是虚拟卷，需要执行删除标记，并且清空数据 + // 将分切计划删除，设备禁用 + plans.forEach(p1 -> { + p1.setIs_delete("1"); + p1.setQzzno(""); + p1.setUpdate_time(DateUtil.now()); + p1.setUpdate_optname(SecurityUtils.getCurrentNickName()); + p1.setUpdate_optid(SecurityUtils.getCurrentUserId()); + }); + slittingproductionplanService.updateBatchById(plans); + // 设备禁用 + point2.setUp_qzzno(""); + point2.setDown_qzzno(""); + } else { + PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); + p.setStatus("05"); + TaskUtils.updateOptMessageBySlitterPlan(p); + slittingproductionplanService.update(p, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getQzzno, collect)); + } + + point2.setRemark(weightStr); + cutpointivtService.updateById(point2); + + point1.setQzzno(""); + point1.setPoint_status("01"); + TaskUtils.updateOptMessageByCachePoint(point1); + point3.setQzzno(""); + point3.setPoint_status("01"); + TaskUtils.updateOptMessageByCachePoint(point3); + deliverycachepointivtService.updateBatchById(Stream.of(point1, point3).collect(Collectors.toList())); + } + // 取消 + if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { + task.setTask_status(TaskStatusEnum.FINISHED.getCode()); + + // 分切计划修改状态回退04 -> 03 + List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) + .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); + PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); + p.setStatus("03"); + TaskUtils.updateOptMessageBySlitterPlan(p); + slittingproductionplanService.update(p, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getQzzno, collect)); + } + TaskUtils.updateOptMessageByTask(task); + taskService.updateById(task); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public String createTask(JSONObject form) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + + SchBaseTask task = new SchBaseTask(); + task.setTask_id(IdUtil.getStringId()); + task.setTask_code(IdUtil.getStringId()); + task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); + task.setPoint_code1(form.getString("point_code1")); + task.setPoint_code2(form.getString("point_code2")); + task.setPoint_code3(form.getString("point_code3")); + task.setPoint_code4(form.getString("point_code4")); + task.setVehicle_code(form.getString("vehicle_code1")); + task.setVehicle_code2(form.getString("vehicle_code2")); + task.setAcs_task_type("6"); + task.setIs_delete("0"); + task.setRequest_param(form.toJSONString()); + task.setTask_type(form.getString("task_type")); + task.setProduct_area(form.getString("product_area")); + task.setCreate_id(currentUserId); + task.setCreate_name(currentUsername); + task.setCreate_time(DateUtil.now()); + task.setHandle_class(THIS_CLASS); + //根据类型获取对应的任务优先级 + JSONObject priority_jo = WQL.getWO("PDA_COOLIN").addParam("flag", "3").addParam("task_type", task.getTask_type()).process().uniqueResult(0); + if (ObjectUtil.isEmpty(priority_jo)) { + task.setPriority("1"); + } else { + task.setPriority(priority_jo.getString("value")); + } + taskService.save(task); + // 分切计划修改状态 03->04 + List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) + .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); + PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); + p.setStatus("04"); + TaskUtils.updateOptMessageBySlitterPlan(p); + slittingproductionplanService.update(p, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getQzzno, collect)); + this.immediateTaskNotifyAcs(task); + return task.getTask_id(); + } + + @Override + public void forceFinish(String task_id) { + JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } + + + @Override + public void cancel(String task_id) { + JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); + this.updateTaskStatus(taskObj, "0"); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java index 86731dfa2..66dbfd0a9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java @@ -28,7 +28,7 @@ public enum SlitterEnum { , "拼单送轴", "010817", "拆单两点移动任务", "010818", "拆单四点移动任务", "010819" , "满轴拼单桁架任务", "010820", "送空轴AGV任务", "010821", "人工叫空轴桁架任务", "010822" , "备货区托盘入库", "010823", "备货区托盘出库", "010824", "送轴拆单任务", "010825" - , "拆单桁架任务", "010826") + , "拆单桁架任务", "010826", "分切合单下卷任务", "010827", "缓存上空轴任务", "010828") ), /** * 二次请求 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java index a76f55f04..190ff304e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java @@ -84,4 +84,6 @@ public interface SlitterMapper { List getReadyShaftCachePoint(StIvtCutpointivt actualDevice); List getCanDownPoints(StIvtCutpointivt actualDevice); + + List getReadyShaftCachePointByDevice(StIvtCutpointivt extCode); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index f8d5734c6..47c78eef6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -471,4 +471,39 @@ ORDER BY base_id, truss_code + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index c25b05b83..646d73e26 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -103,7 +103,9 @@ public class SlitterServiceImpl implements SlitterService { * 套轴区域 */ public final static String PARAM_CODE_PLAN_AREA = "PARAM_CODE_PLAN_AREA"; - /** 合单配送 */ + /** + * 合单配送 + */ public final static String IS_COMBINED_ORDER = "IS_COMBINED_ORDER"; @Autowired private BstIvtStockingivtMapper bstIvtStockingivtMapper; @@ -171,6 +173,8 @@ public class SlitterServiceImpl implements SlitterService { private IDeliverycachepointivtService deliverycachepointivtService; @Autowired private SlitterDownNewTrussTask slitterDownNewTrussTask; + @Autowired + private UpShaftTrussNewTask upShaftTrussNewTask; // 预编译正则表达式，提升性能 private static final Pattern GX_PATTERN = Pattern.compile("^GX(0[1-9]|[1-9]\\d)$"); @@ -404,6 +408,7 @@ public class SlitterServiceImpl implements SlitterService { * completeShaftLoading() - 完成套轴 * tryCombineOrder() - 尝试拼单逻辑 * handleNormalProcess() - 处理正常业务流程 + * * @param param * @return */ @@ -416,7 +421,7 @@ public class SlitterServiceImpl implements SlitterService { // 穿拔轴位 String deviceCode = param.getString("device_code"); List stepTipLogs = getRedisListValue("ERROR" + deviceCode); - // 枷锁 + RLock lock = redissonClient.getLock("doAcsFinishLoadShaft"); boolean tryLock = lock.tryLock(10, TimeUnit.SECONDS); @@ -739,10 +744,10 @@ public class SlitterServiceImpl implements SlitterService { String targetRestructContainer = firstPlan.getRestruct_container_name(); List filterNextPlans = allReadyPlans.stream() .filter(plan -> - Objects.equals(targetGroup, plan.getSplit_group()) - && Objects.equals(targetParentContainer, plan.getParent_container_name()) - && Objects.equals(targetRestructContainer, plan.getRestruct_container_name()) - ).collect(Collectors.toList()); + Objects.equals(targetGroup, plan.getSplit_group()) + && Objects.equals(targetParentContainer, plan.getParent_container_name()) + && Objects.equals(targetRestructContainer, plan.getRestruct_container_name()) + ).collect(Collectors.toList()); log.info("获取下一趟分切计划数据：{}", filterNextPlans); // 查找分切对接位空位（根据原理分切机先放，优先放）（区域、location、plan进行过滤） List slitterDownNewDtoList = slitterMapper.getCanDownPoints(actualDevice); @@ -949,14 +954,14 @@ public class SlitterServiceImpl implements SlitterService { throw new BadRequestException("错误表达式"); } // 创建任务 - taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); + taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切合单下卷任务")); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); // taskParam.put("d_containers", currentPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); // taskParam.put("u_containers", filterNextPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); JSONArray array = new JSONArray(); array.add(taskParam); if (ObjectUtil.isNotEmpty(taskParam2)) { - taskParam2.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); + taskParam2.put("task_type", SlitterEnum.TASK_TYPE.code("分切合单下卷任务")); taskParam2.put("product_area", SlitterConstant.SLITTER_TASK_AREA); // taskParam2.put("d_containers", currentPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); // taskParam2.put("u_containers", filterNextPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); @@ -1514,7 +1519,7 @@ public class SlitterServiceImpl implements SlitterService { if (tryLock) { // param: point_code String pointCode = param.getString("point_code"); - if (ObjectUtil.isEmpty(pointCode)){ + if (ObjectUtil.isEmpty(pointCode)) { throw new BadRequestException("点位编码不能为空！"); } // 校验是否存在任务 @@ -2375,36 +2380,130 @@ public class SlitterServiceImpl implements SlitterService { JSONObject res = new JSONObject(); res.put("status", HttpStatus.HTTP_OK); res.put("message", "创建桁架任务成功!"); - // param: area, device_code - String area = param.getString("area"); - String deviceCode = param.getString("device_code"); - // 获取当前分切机的下一组分切计划(最多四条分切计划) - // hint: 获取到的分切可能是不同组的但具有一定时间顺序, 可能是以前的脏数据 - List timePlans = slittingproductionplanService.list( - new LambdaQueryWrapper() - .eq(PdmBiSlittingproductionplan::getResource_name, deviceCode) - .eq(PdmBiSlittingproductionplan::getStatus, "03") - .eq(PdmBiSlittingproductionplan::getIs_delete, "0") - .orderByAsc(PdmBiSlittingproductionplan::getUpdate_time)); - log.info("获取下一组分切计划：{}", timePlans); - if (timePlans.size() > 0) { - // 寻找备好轴的对接点位 - List cutPointList = slitterMapper.getReadyShaftPoint(deviceCode); - if (cutPointList.size() == 0) { - throw new BadRequestException("没有为设备[" + deviceCode + "]套好轴的位置!"); + RLock open = redissonClient.getLock("lock:doUpShaftToSlitterByDevice"); + boolean openLock = false; + try { + openLock = open.tryLock(0, TimeUnit.SECONDS); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + try { + if (openLock) { + // param: area, device_code + String area = param.getString("area"); + String deviceCode = param.getString("device_code"); + StIvtCutpointivt extCode = cutpointivtService.getPintByExtCode(deviceCode, true); + if (ObjectUtil.isEmpty(extCode)) { + throw new BadRequestException("该设备不存在或者被禁用，请检查！"); + } + List cachePoints = slitterMapper.getReadyShaftCachePointByDevice(extCode); + List cutPointList = slitterMapper.getReadyShaftPoint(deviceCode); + if (cachePoints.size() > 0) { + // 在缓存架子上 + doUpShaftToSlitterByNew(param, cachePoints, extCode); + } else if (cutPointList.size() > 0) { + // 在对接位 + // 找到该分切计划的点位 + BstIvtCutpointivt newCutPoint = cutPointList.get(0); + // 创建任务 + JSONObject taskParam = new JSONObject(); + taskParam.put("point_code", newCutPoint.getPoint_code()); + doUpShaftToSlitter(taskParam); + } else { + throw new BadRequestException("没有为设备[" + deviceCode + "]套好轴的位置!"); + } } else { - // 找到该分切计划的点位 - BstIvtCutpointivt newCutPoint = cutPointList.get(0); - // 创建任务 - JSONObject taskParam = new JSONObject(); - taskParam.put("point_code", newCutPoint.getPoint_code()); - doUpShaftToSlitter(taskParam); + throw new BadRequestException("系统繁忙，稍后在试!!"); } + } finally { + if (openLock) { + open.unlock(); + } + } + return res; + } + + /** + * 创建新的上轴任务 + * + * @param param 参数（区域，设备号） + * @param cachePoints 气胀轴存放位置 + * @param device 设备实体 + */ + public void doUpShaftToSlitterByNew(JSONObject param, List cachePoints, StIvtCutpointivt device) { + List actualPoints = cachePoints; + if (cachePoints.size() > 2) { + // todo: 需要过滤(正常不会出现，先不考虑) + throw new BadRequestException("计划冗余，请检查!"); + } + // 获取计划数据 + List qzznos = cachePoints.stream().map(Deliverycachepointivt::getQzzno).collect(Collectors.toList()); + List plans = slittingproductionplanService.getByQzzNos(qzznos); + if (plans.isEmpty()) { + throw new BadRequestException("计划不存在！请检查点位:" + + cachePoints.stream().map(Deliverycachepointivt::getPoint_code).collect(Collectors.toList()) + + "的数据!"); + } + JSONObject taskParam = new JSONObject(); + // 根据计划筛选上下轴任务，并构建任务参数 + PdmBiSlittingproductionplan nextUpPlan = plans.stream() + .filter(p -> SlitterConstant.SLITTER_SHAFT_UP.equals(p.getUp_or_down())) + .findFirst() + .orElse(null); + PdmBiSlittingproductionplan nextDownPlan = plans.stream() + .filter(p -> SlitterConstant.SLITTER_SHAFT_DOWN.equals(p.getUp_or_down())) + .findFirst() + .orElse(null); + Deliverycachepointivt upNeedPoint = actualPoints.stream() + .filter(p -> { + assert nextUpPlan != null; + return p.getQzzno().equals(nextUpPlan.getQzzno()); + }) + .findFirst() + .orElse(null); + Deliverycachepointivt downNeedPoint = actualPoints.stream() + .filter(p -> { + assert nextDownPlan != null; + return p.getQzzno().equals(nextDownPlan.getQzzno()); + }) + .findFirst() + .orElse(null); + if (ObjectUtil.isNotEmpty(nextUpPlan) && ObjectUtil.isNotEmpty(nextDownPlan)) { + // 上轴都不会空 + // 双轴任务参数构建 + assert downNeedPoint != null; + taskParam.put("point_code1", downNeedPoint.getPoint_code()); + taskParam.put("point_code2", device.getDown_point_code()); + assert upNeedPoint != null; + taskParam.put("point_code3", upNeedPoint.getPoint_code()); + taskParam.put("point_code4", device.getUp_point_code()); + taskParam.put("vehicle_code1", upNeedPoint.getQzzno()); + taskParam.put("vehicle_code2", downNeedPoint.getQzzno()); } else { - throw new BadRequestException("没有为设备[" + deviceCode + "]套好轴的位置!"); + // 单轴任务参数构建 + if (ObjectUtil.isNotEmpty(nextUpPlan)) { + // 上轴任务 + assert upNeedPoint != null; + taskParam.put("point_code1", upNeedPoint.getPoint_code()); + taskParam.put("point_code2", device.getUp_point_code()); + taskParam.put("vehicle_code1", upNeedPoint.getQzzno()); + } else { + // 下轴任务 + assert downNeedPoint != null; + taskParam.put("point_code1", downNeedPoint.getPoint_code()); + taskParam.put("point_code2", device.getDown_point_code()); + taskParam.put("vehicle_code2", downNeedPoint.getQzzno()); + } } - return res; + // 构建任务的其他参数 + taskParam.put("truss_type", "1"); + taskParam.put("empty_site", "0"); + taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("缓存上空轴任务")); + taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + taskParam.put("u_containers", plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); + // 创建任务 + upShaftTrussNewTask.createTask(taskParam); } @Override @@ -3903,13 +4002,14 @@ public class SlitterServiceImpl implements SlitterService { /** * 创建拼单任务 - * @param cutPoint 分切点位 + * + * @param cutPoint 分切点位 * @param startPoint 穿拔轴点位 - * @param demoPlan 分切计划 - * @param qzzNo 气胀轴编码 + * @param demoPlan 分切计划 + * @param qzzNo 气胀轴编码 */ private void createCombinedOrderTask(BstIvtCutpointivt cutPoint, BstIvtShafttubeivt startPoint, - PdmBiSlittingproductionplan demoPlan, String qzzNo) { + PdmBiSlittingproductionplan demoPlan, String qzzNo) { JSONObject taskParam = new JSONObject(); taskParam.put("point_code1", startPoint.getPoint_code()); @@ -3933,8 +4033,8 @@ public class SlitterServiceImpl implements SlitterService { * 处理正常业务流程（不拼单） */ private void handleNormalProcess(PdmBiSlittingproductionplan demoPlan, BstIvtShafttubeivt startPoint, - String qzzNo, List containerNames, String deviceCode, - List stepTipLogs) { + String qzzNo, List containerNames, String deviceCode, + List stepTipLogs) { // 查找是否有同组的气胀轴位置 BstIvtCutpointivt cutPoint = findSameGroupPoint(demoPlan); @@ -3978,8 +4078,8 @@ public class SlitterServiceImpl implements SlitterService { * 创建半条任务 */ private void createHalfTask(BstIvtShafttubeivt startPoint, PdmBiSlittingproductionplan demoPlan, - String qzzNo, List containerNames, String deviceCode, - List stepTipLogs) { + String qzzNo, List containerNames, String deviceCode, + List stepTipLogs) { stepTipLogs.add("提示：套轴完成->找不到可用套轴对接位，创建半条任务，等待AGV取货完成触发!"); redisUtils.set("ERROR" + deviceCode, stepTipLogs); @@ -4003,8 +4103,8 @@ public class SlitterServiceImpl implements SlitterService { * 创建正常任务 */ private void createNormalTask(BstIvtCutpointivt cutPoint, BstIvtShafttubeivt startPoint, - PdmBiSlittingproductionplan demoPlan, String qzzNo, - List containerNames) { + PdmBiSlittingproductionplan demoPlan, String qzzNo, + List containerNames) { JSONObject taskParam = new JSONObject(); taskParam.put("point_code1", startPoint.getPoint_code()); taskParam.put("point_code2", SlitterConstant.SLITTER_SHAFT_UP.equals(demoPlan.getUp_or_down())