From d055944be4b1259e9678712191fe48883aec7d44 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Sat, 4 Jan 2025 15:52:34 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E6=94=B6=E5=8D=B7=E9=94=9F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=89=E7=94=B5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 2 +- .../RollUpRollerManipulatorDeviceDriver.java | 41 +++++++++++++------ .../wms/service/impl/WmsToAcsServiceImpl.java | 27 ++++++------ .../task/service/impl/TaskServiceImpl.java | 12 +++--- .../st/service/impl/OtherPdaServiceImpl.java | 10 +++++ .../sch/task/service/ISchBaseTaskService.java | 2 + .../service/dao/mapper/SchBaseTaskMapper.java | 2 + .../service/dao/mapper/SchBaseTaskMapper.xml | 15 +++++++ .../service/impl/SchBaseTaskServiceImpl.java | 5 +++ 9 files changed, 85 insertions(+), 31 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 12e063557..70947d710 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -1156,7 +1156,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic //收卷锟行架 if (linkDevice.getDeviceDriver() instanceof RollUpRollerManipulatorDeviceDriver) { rollUpRollerManipulatorDeviceDriver = (RollUpRollerManipulatorDeviceDriver) linkDevice.getDeviceDriver(); - if ((manipulatorAgvStationDeviceDriver.getAction() == 6 && rollUpRollerManipulatorDeviceDriver.getMode() != 3 && rollUpRollerManipulatorDeviceDriver.getError() == 0 && rollUpRollerManipulatorDeviceDriver.getTask() == 0 && rollUpRollerManipulatorDeviceDriver.getError2() == 0)) { + if ((manipulatorAgvStationDeviceDriver.getAction() == 6 && rollUpRollerManipulatorDeviceDriver.getMode() != 3 && rollUpRollerManipulatorDeviceDriver.getError() == 0 && rollUpRollerManipulatorDeviceDriver.getTask() == 0 && rollUpRollerManipulatorDeviceDriver.getError2() == 0 && manipulatorAgvStationDeviceDriver.getMove() == 1)) { // 查询缓存架点位状态 JSONObject param = new JSONObject(); param.put("device_code", device_code); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/roll_up_roller_manipulator/RollUpRollerManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/roll_up_roller_manipulator/RollUpRollerManipulatorDeviceDriver.java index 2c39ea473..c011565c4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/roll_up_roller_manipulator/RollUpRollerManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/roll_up_roller_manipulator/RollUpRollerManipulatorDeviceDriver.java @@ -217,18 +217,19 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver this.setIserror(true); message = "universal_message3"; //满入空出分配新点位 - if ((error2 == 2 || error2 == 3) && !actionRequireSucess) { - if (task == 0 || target == null) { - notCreateInstMessage = "管芯规格或库位为空"; - } else { - if (error2 == 2) { - errorDispose(PointErrorTypeEnum.IN.getCode()); - } else { - errorDispose(PointErrorTypeEnum.OUT.getCode()); - - } - } - } + //行架有问题 +// if ((error2 == 2 || error2 == 3) && !actionRequireSucess) { +// if (task == 0 || target == null) { +// notCreateInstMessage = "管芯规格或库位为空"; +// } else { +// if (error2 == 2) { +// errorDispose(PointErrorTypeEnum.IN.getCode()); +// } else { +// errorDispose(PointErrorTypeEnum.OUT.getCode()); +// +// } +// } +// } //无报警 } @@ -535,6 +536,14 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver return false; } } + + if (startDevice.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { + manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) startDevice.getDeviceDriver(); + if (manipulatorAgvStationDeviceDriver.getMove() != 0) { + notCreateInstMessage = "手动创建指令未下发电气信号原因->放货位-收卷锟对接位:" + manipulatorAgvStationDeviceDriver.getMove() + "有货,无法下发指令!任务号:" + instruction.getInstruction_code(); + return false; + } + } Map map1 = new HashMap<>(); Map map2 = new HashMap<>(); Map map3 = new HashMap<>(); @@ -600,6 +609,14 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver } } + if (startDevice.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { + manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) startDevice.getDeviceDriver(); + if (manipulatorAgvStationDeviceDriver.getMove() != 0) { + notCreateInstMessage = "手动创建指令未下发电气信号原因->放货位-收卷锟对接位:" + manipulatorAgvStationDeviceDriver.getMove() + "有货,无法下发指令!" ; + return false; + } + } + String taskid = taskDto.getTask_id(); String taskcode = taskDto.getTask_code(); String route_plan_code = taskDto.getRoute_plan_code(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index cd35b8e4c..4c14e0c42 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -303,17 +303,17 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { errArr.add(json); continue; } - if (!StrUtil.isEmpty(vehicle_code)) { - TaskDto vehicle_dto = taskserver.findByContainer(vehicle_code); - if (vehicle_dto != null) { - JSONObject json = new JSONObject(); - json.put("task_code", task_code); - json.put("ext_task_id", ext_task_id); - json.put("message", "已存在任务编号为" + vehicle_dto.getTask_code() + "托盘号:" + vehicle_code); - errArr.add(json); - continue; - } - } +// if (!StrUtil.isEmpty(vehicle_code)) { +// TaskDto vehicle_dto = taskserver.findByContainer(vehicle_code); +// if (vehicle_dto != null) { +// JSONObject json = new JSONObject(); +// json.put("task_code", task_code); +// json.put("ext_task_id", ext_task_id); +// json.put("message", "已存在任务编号为" + vehicle_dto.getTask_code() + "托盘号:" + vehicle_code); +// errArr.add(json); +// continue; +// } +// } if (StrUtil.isEmpty(start_point_code)) { JSONObject json = new JSONObject(); @@ -735,9 +735,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String targetAddress = gxDevice.getExtraValue().get("address").toString(); map.put("to_target" + (i + 1), targetAddress); } - map.put("to_command", 1); + pipeCoreRackStationDeviceDriver.writing(map); + Map map1 = new HashMap(); + map1.put("to_command", 1); + pipeCoreRackStationDeviceDriver.writing(map1); } JSONObject resultJson = new JSONObject(); resultJson.put("status", HttpStatus.OK.value()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 840d4aed7..d31d97df6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -555,12 +555,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme public void create(TaskDto dto) throws Exception { dto = foramte(dto); dto.setInteraction_json(ObjectUtil.isNotEmpty(dto.getInteractionJson()) ? dto.getInteractionJson().toJSONString() : ""); - if (!StrUtil.isEmpty(dto.getVehicle_code())) { - TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code()); - if (vehicle_dto != null) { - throw new BadRequestException(LangProcess.msg("task_checkExist", dto.getVehicle_code())); - } - } +// if (!StrUtil.isEmpty(dto.getVehicle_code())) { +// TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code()); +// if (vehicle_dto != null) { +// throw new BadRequestException(LangProcess.msg("task_checkExist", dto.getVehicle_code())); +// } +// } String currentUsername = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); String task_uuid = dto.getTask_id(); 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 bbf1e548f..332819d7a 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 @@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.md.wastefoilrecord.service.dto.WastefoilrecordQuery; import org.nl.wms.pda.st.service.OtherPdaService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; +import org.nl.wms.sch.point.service.impl.SchBasePointServiceImpl; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.TaskStatus; @@ -53,6 +55,8 @@ public class OtherPdaServiceImpl implements OtherPdaService { private SendWasteFoilAGVTask sendWasteFoilAGVTask; @Autowired private ISchBasePointService pointService; + @Autowired + private SchBasePointServiceImpl schBasePointServiceImpl; @Override @Transactional(rollbackFor = Exception.class) @@ -238,6 +242,12 @@ public class OtherPdaServiceImpl implements OtherPdaService { log.info("手持呼叫AGV送样品检测 - {}", param); // point_code1, point_code2 String pointCode1 = param.getString("point_code1"); + SchBasePoint schBasePoint = schBasePointServiceImpl.getById(pointCode1); + + List schBaseTasks = taskService.cheackFqAndED(schBasePoint.getRegion_code()); + if (schBaseTasks.size() > 0) { + throw new BadRequestException("已经存在其它区域的任务！"); + } //不判断是否有执行的任务 // List schBaseTasks = taskService.checkHaveTask(pointCode1); // if (schBaseTasks.size() > 0) { diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index e9c2debd4..ad2b038f1 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -168,4 +168,6 @@ public interface ISchBaseTaskService extends IService { * @return / */ boolean checkAllWaiteByWasteFoil(); + + List cheackFqAndED(String regionCode); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java index 9987469c2..cf73eee08 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java @@ -21,4 +21,6 @@ public interface SchBaseTaskMapper extends BaseMapper { List checkHaveRelatedTaskInRequestParam(String param); List getWasteFoilTask(String code); + + List cheackFqAndED(String regionCode); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml index 5f8d2a822..aad277bc8 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml @@ -69,4 +69,19 @@ AND task_status ]]> '07' AND request_param LIKE '%${code}%' + + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index dff215428..933a06089 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -304,4 +304,9 @@ public class SchBaseTaskServiceImpl extends ServiceImpl cheackFqAndED(String regionCode) { + return schBaseTaskMapper.cheackFqAndED(regionCode); + } + }