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

fix: 修复分切下料AGV任务没校验禁用点位

Browse Source
This commit is contained in:
liyongde
2024-06-22 17:26:10 +08:00
parent c11f1ed3af
commit 74db7e79e0
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.utils.SecurityUtils;
import org.nl.common.utils.TaskUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.sch.AcsTaskDto;
@@ -76,6 +77,9 @@ public class SlitterDownAgvTask extends AbstractAcsTask {
task.setTask_status(TaskStatusEnum.EXECUTING.getCode());
}
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
if (TaskStatusEnum.FINISHED.getCode().equals(task.getTask_status())) {
throw new BadRequestException("任务[" + task.getTask_code() + "]已经完成！");
}
task.setTask_status(TaskStatusEnum.FINISHED.getCode());
// 互换资源
String startPoint = task.getPoint_code1();

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

@@ -97,9 +97,9 @@ public class AutoUpShaftTrussTask {
if (ObjectUtil.isNotEmpty(nextUpPlan) && ObjectUtil.isNotEmpty(nextDownPlan)) {
// 双轴任务参数构建
param.put("point_code1", newCutPoint.getTruss_point_code2());
param.put("point_code1", newCutPoint.getTruss_point_code1());
param.put("point_code2", device.getUp_point_code());
param.put("point_code3", newCutPoint.getTruss_point_code1());
param.put("point_code3", newCutPoint.getTruss_point_code2());
param.put("point_code4", device.getDown_point_code());
param.put("vehicle_code1", newCutPoint.getQzz_no1());
param.put("vehicle_code2", newCutPoint.getQzz_no2());

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java
View File

@@ -21,7 +21,7 @@ public enum SlitterEnum {
*/
TASK_TYPE(MapOf.of("穿拔轴缓存<>穿拔轴位", "010801", "穿拔轴缓存<>分切对接位", "010802", "穿拔轴位<>气胀轴缓存位", "010803"
, "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807"
, "备货区送纸管", "010808"));
, "备货区送纸管", "010808", "分切机下料桁架任务", "010809"));
private Map<String, String> code;
public String code(String desc) {

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
View File

@@ -27,6 +27,7 @@
FROM `bst_ivt_cutpointivt` bct
WHERE bct.point_type IN ('2', '3')
AND bct.point_status = '3'
AND bct.is_used = '1'
AND 0 = (SELECT COUNT(*)
FROM sch_base_task t
WHERE t.task_status <![CDATA[ < ]]> '07'

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

@@ -414,6 +414,7 @@ public class SlitterServiceImpl implements SlitterService {
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);
// 分切计划修改状态 05 -> 06
currentPlans.forEach(plan -> {
@@ -505,6 +506,7 @@ public class SlitterServiceImpl implements SlitterService {
throw new BadRequestException("错误表达式");
}
// 创建任务
taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务"));
taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
slitterDownTrussTask.createTask(taskParam);
// 下来的分切计划修改状态：05 -> 06