root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 异常处理任务类型

Browse Source
This commit is contained in:
liyongde
2025-06-13 17:24:20 +08:00
parent 52329b209d
commit 34cf36c90e
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java
View File

@@ -126,7 +126,8 @@ public class SendNBJExceptionPointTask extends AbstractAcsTask {
task.setPoint_code2(form.getString("point_code2"));
task.setVehicle_code(form.getString("vehicle_code1"));
task.setVehicle_code2(form.getString("vehicle_code2"));
task.setAcs_task_type("3");
// 行家任务给6，AGV给3
task.setAcs_task_type(ObjectUtil.isNotEmpty(form.getString("acs_task_type")) ? form.getString("acs_task_type") : "3");
task.setIs_delete(SlitterConstant.SLITTER_NO);
task.setRequest_param(form.toJSONString());
task.setTask_type(form.getString("task_type"));

24
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
View File

@@ -915,18 +915,20 @@ public class AutoCallAirShaftTask extends Prun {
? shafttubeivt.getContainer_name1() : shafttubeivt.getContainer_name2();
// 获取这个子卷号的分切计划
PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName(containerCode);
String parent = SlitterConstant.SLITTER_TYPE_PAPER.equals(byContainerName.getPaper_tube_or_FRP())
? byContainerName.getParent_container_name()
: byContainerName.getRestruct_container_name();
if (byContainerName.getResource_name().equals(dto.getResource_name())) {
// 如果是同设备同母卷、同组，证明是一根轴上的，故允许套轴
if (parent.equals(dto.getParent_container_name())
&& byContainerName.getSplit_group().equals(dto.getSplit_group())) {
return true;
if (ObjectUtil.isNotEmpty(byContainerName)) {
String parent = "1".equals(byContainerName.getOrder_type())
? byContainerName.getParent_container_name()
: byContainerName.getRestruct_container_name();
if (byContainerName.getResource_name().equals(dto.getResource_name())) {
// 如果是同设备同母卷、同组，证明是一根轴上的，故允许套轴
if (parent.equals(dto.getParent_container_name())
&& byContainerName.getSplit_group().equals(dto.getSplit_group())) {
return true;
}
stepStr += ",4";
stepErrorInfo.add("穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了...");
return false;
}
stepStr += ",4";
stepErrorInfo.add("穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了...");
return false;
}
}
// 校验是否在拔轴暂存位、分切对接位有相同设备的分切计划信息。

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -347,6 +347,7 @@ public class SlitterServiceImpl implements SlitterService {
}
exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务"));
exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
exParam.put("acs_task_type", "6");
sendNBJExceptionPointTask.createTask(exParam);
res.put("status", HttpStatus.HTTP_OK);
res.put("message", "创建送至异常处理位!");