From bd625244b695d3eb8fca3c4f9b0cfc6b9563423d Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Tue, 4 Mar 2025 14:27:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/st/service/impl/NbjPdaServiceImpl.java | 10 ++++++++++ .../st/service/impl/OtherPdaServiceImpl.java | 5 +++++ .../controller/SchBasePointController.java | 6 ++++++ .../point/service/ISchBasePointService.java | 2 ++ .../service/impl/SchBasePointServiceImpl.java | 18 ++++++++++++------ .../tasks/slitter/SlitterDownAGVTask.java | 7 +++++++ 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java index c0239a799..9a2e0ba47 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java @@ -473,9 +473,19 @@ public class NbjPdaServiceImpl implements NbjPdaService { } if (message.containsKey(startPointCode) && !endPoint.getPlan().equals(message.get(startPointCode))) { throw new BadRequestException("请求搬运失败，缓存架气涨轴类型与分切机不匹配！"); + } else { + if (endPoint.getPlan().equals("1")){ + taskParam.put("point_code1", startPoint.getPoint_code()+"_C"); + } + if (endPoint.getPlan().equals("2")){ + taskParam.put("point_code1", startPoint.getPoint_code()+"_D"); + } } + + + } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java index beabf14cd..506156177 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -69,11 +70,15 @@ public class OtherPdaServiceImpl implements OtherPdaService { // 只做保存任务 // point_code String pointCode = param.getString("point_code"); + String startPoint = param.getString("start_point"); List schBaseTasks = taskService.checkHaveTask(pointCode); if (schBaseTasks.size() > 0) { throw new BadRequestException("点位[" + pointCode + "]已经存在任务！"); } JSONObject taskParam = new JSONObject(); + if (StrUtil.isNotEmpty(startPoint)){ + taskParam.put("point_code1", startPoint); + } taskParam.put("point_code2", pointCode); taskParam.put("index_task", 1); taskParam.put("config_code", "SendWasteFoilAGVTask"); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java index b77609c0d..2e12ebf96 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java @@ -75,4 +75,10 @@ public class SchBasePointController { schBasePointService.changeLock(points); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + + @GetMapping("/getWastePointList") + @Log("获取区域下拉框") + public ResponseEntity getWastePointList(){ + return new ResponseEntity<>(schBasePointService.getWastePointList(),HttpStatus.OK); + } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java index 77be7afca..52ed74807 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java @@ -127,4 +127,6 @@ public interface ISchBasePointService extends IService { List getAllBusinessTaskPoint(String area, String region, String pointType, String pointStatus, String vehicleType, String vehicleCode); + + List getWastePointList(); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 906178b0a..8aa919b65 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.sch.point.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -26,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -106,7 +104,7 @@ public class SchBasePointServiceImpl extends ServiceImpl getAllBusinessTaskPoint(String area, String region, String pointType, - String pointStatus, String vehicleType, String vehicleCode) { + String pointStatus, String vehicleType, String vehicleCode) { return pointMapper.getAllBusinessTaskPoint(area, region, pointType, pointStatus, vehicleType, vehicleCode); } + @Override + public List getWastePointList() { + + List list = getAllBusinessNotTaskPoint("A1", "A1-FB", null, "1", null, null); + return list.stream().filter(item -> item.getPoint_code().contains("ZD") || item.getPoint_code().contains("QD") ).collect(Collectors.toList()); + + } + @Override public List getWindRollConformRawNotTaskPoints(String code) { return pointMapper.getWindRollConformRawNotTaskPoints(code); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java index 02e9b7cc5..643006fcf 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java @@ -142,7 +142,14 @@ public class SlitterDownAGVTask extends AbstractTask { for (BstIvtCutpointivt bstIvtCutpointivt : areaEmptyNotTaskPoint) { if (message.containsKey(bstIvtCutpointivt.getPoint_code())){ if ( bstIvtCutpointivt.getPlan().equals(message.get(bstIvtCutpointivt.getPoint_code()))) { + endPoint = bstIvtCutpointivt; + if (endPoint.getPlan().equals("1")){ + endPoint.setPoint_code(endPoint.getPoint_code()+"_C"); + } + if (endPoint.getPlan().equals("2")){ + endPoint.setPoint_code(endPoint.getPoint_code()+"_D"); + } } else { throw new BadRequestException("请求搬运失败，缓存架气涨轴类型与分切机不匹配！"); }