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

rev：1.增加C生产区到地面货架双向配置2.修改A_2生产区到地面货架13排车辆配置

Browse Source
This commit is contained in:
liuxy
2025-04-21 14:59:38 +08:00
parent 7a78baae00
commit d44a5f8ac2
6 changed files with 329 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs2/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -545,13 +545,18 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
if (ObjectUtil.isEmpty(regionEnumList)) {
throw new BadRequestException("任务 [" + instdto.getTask_code() + "] 起点或终点没有找到对应AGV类型无法生成指令。");
}
// 判断是否是AB生产区到地面货架
if (regionEnumList.size() > 1) {
// 判断终点是否是1层的
if (nextJson.getString("z").equals("01")) {
// 如果是终点是13排的则是PS30车辆
if (nextJson.getString("x").equals("13")) {
instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type());
} else {
instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type());
// 判断终点是否是1层的
if (nextJson.getString("z").equals("01")) {
instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type());
} else {
instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type());
}
}
} else {
instdto.setMaterial(regionEnumList.get(0).getAgv_type());

12
acs2/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -459,12 +459,18 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
throw new BadRequestException("任务 [" + taskcode + "] 起点或终点没有找到对应AGV类型无法生成指令。");
}
// 判断是否是AB生产区到地面货架
if (regionEnumList.size() > 1) {
// 判断终点是否是1层的
if (nextJson.getString("z").equals("01")) {
// 如果是终点是13排的则是PS30车辆
if (nextJson.getString("x").equals("13")) {
instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type());
} else {
instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type());
// 判断终点是否是1层的
if (nextJson.getString("z").equals("01")) {
instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type());
} else {
instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type());
}
}
} else {
instdto.setMaterial(regionEnumList.get(0).getAgv_type());

6
acs2/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RegionEnum.java
View File

@@ -41,6 +41,12 @@ public enum RegionEnum {
// C生产区-->D生产区
C_D("C", "D","PS20","Group-001"),
// C生产区-->地面货架
C_DMHJ("C", "DMHJ","PS20","Group-001"),
// 地面货架-->C生产区
DMHJ_C("DMHJ", "C","PS20","Group-001"),
// D生产区-->地面货架
D_DMHJ("D", "DMHJ","PS20","Group-001"),

12
acs2/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
View File

@@ -212,12 +212,18 @@ public class AutoCreateInst {
continue;
}
// 判断是否是AB生产区到地面货架
if (regionEnumList.size() > 1) {
// 判断终点是否是1层的
if (nextJson.getString("z").equals("01")) {
// 如果是终点是13排的则是PS30车辆
if (nextJson.getString("x").equals("13")) {
instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type());
} else {
instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type());
// 判断终点是否是1层的
if (nextJson.getString("z").equals("01")) {
instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type());
} else {
instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type());
}
}
} else {
instdto.setMaterial(regionEnumList.get(0).getAgv_type());