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

add:增加二次分配代码逻辑

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-21 11:40:03 +08:00
parent 810e8bb510
commit a9d3f7d1cc
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lms/nladmin-system/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java
View File

@@ -18,23 +18,38 @@ import java.util.Map;
@Getter
public enum PackageInfoIvtEnum {
//点位类型
POINT_STATUS(MapOf.of("满轴缓存位", "1", "空载具缓存位", "2", "待检区", "3", "管制区", "4", "装箱位", "5","装箱区", "6")),
POINT_STATUS(MapOf.of("满轴缓存位", "1", "空载具缓存位", "2", "待检区", "3", "管制区", "4", "装箱位", "5", "装箱区", "6","等待点", "7")),
//任务类型
TASK_TYPE(MapOf.of("输送线->满轴缓存位", "010901", "满轴缓存位->待检区", "010902", "满轴缓存位->管制区", "010903", "放空(空载具缓存位->输送线)",
"010904", "取空(待检区或管制区->空载具缓存位)", "010905", "待检区->管制区", "010906","管制区->待检区", "010907","待检区->装箱区", "010908", "装箱区->装箱对接位", "010909","放空(装箱区->待检区)", "010910","输送线四个点任务", "010911","送空(装箱区->待检区或管制区)", "010912")),
"010904", "补空(待检区或管制区->空载具缓存位)", "010905", "待检区->管制区", "010906", "管制区->待检区", "010907", "待检区->装箱区", "010908", "装箱区->装箱对接位", "010909", "放空(装箱区->待检区)", "010910", "输送线四个点任务", "010911", "送空(装箱区->待检区或管制区)", "010912")),
//ACS任务类型
ACS_TASK_TYPE(MapOf.of("agv任务", "1", "桁架任务", "6")),
//agv二次分配类型
AGV_ACTION_TYPE(MapOf.of("普通任务", "1", "取货二次分配", "2", "放货二次分配", "3", "取放货二次分配", "4")),
//二次分配请求类型
TASK_ACTION_TYPE(MapOf.of("取货分配", "1", "放货分配", "2", "取货完成", "3", "放货完成", "4")),
//起点终点类型
TASK_POINT_TYPE(MapOf.of("取货任务", "1", "放货任务", "2")),
//排序方式
SORT_TYPE(MapOf.of("升序", "1", "降序", "2")),
//ACS系统类型
AGV_SYSTEM_TYPE(MapOf.of("1楼诺宝任务", "1", "2楼1区域AGV系统", "2", "1楼叉车任务", "3")),
//桁架任务类型
TRUSS_TYPE(MapOf.of("点对点任务", "1", "下卷拔轴任务", "6", "换轴任务", "7","放轴任务", "8")),
TRUSS_TYPE(MapOf.of("点对点任务", "1", "下卷拔轴任务", "6", "换轴任务", "7", "放轴任务", "8")),
//是否
IS_USED(MapOf.of("启用", "1", "未启用", "0")),
@@ -43,7 +58,7 @@ public enum PackageInfoIvtEnum {
POINT_LOCATION(MapOf.of("上", "0", "下", "1")),
//库存状态
IVT_STATUS(MapOf.of("空", "0","空载具", "1","有子卷","2","合格品","3","管制品","4"));
IVT_STATUS(MapOf.of("空", "0", "空载具", "1", "有子卷", "2", "合格品", "3", "管制品", "4"));
private Map<String, String> code;
@@ -56,6 +71,14 @@ public enum PackageInfoIvtEnum {
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public Long longCode(String desc) {
String code = this.getCode().get(desc);
if (StringUtils.isNotEmpty(code)) {
return Long.valueOf(code);
}
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public String check(String code) {
for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
if (entry.getValue().equals("code")) {

7
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java
View File

@@ -51,6 +51,13 @@ public class AcsTaskDto {
* Agv系统类型
*/
private String agv_system_type;
/**
* agv二次分配类型（1、普通任务 2、取货二次分配 3、放货二次分配 4、取放货二次分配）
*/
private String agv_action_type;
/**
* 备注
*/