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

fix: 判断轴

Browse Source
This commit is contained in:
liyongde
2025-12-23 20:27:47 +08:00
parent 2f90a9e20d
commit 1abe523c23
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,6 +223,14 @@ public class AutoCallAirShaftTask extends Prun {
}
}
}
try {
plans.sort(Comparator
.comparing(SlitterPlanDistinctDto::getManufacture_sort).reversed()
.thenComparing(SlitterPlanDistinctDto::getStart_time)
.thenComparing(SlitterPlanDistinctDto::getSplit_group));
} catch (Exception e) {
stepErrorInfo.add("排序失败，没有进行排序！");
}
log.info("获取过滤后的分切计划数据：{}", JSON.toJSONString(plans));
// 查看套轴对接位是否满了
List<BstIvtCutpointivt> emptyShaftPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",

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

@@ -647,11 +647,13 @@ public class SlitterServiceImpl implements SlitterService {
}
BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false);
// 获取气涨轴缓存没有任务的点位
// List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCache(qzzSize,
// startPoint.getQzz_generation(), startPoint.getPoint_location());
// if (shafttubeivts.size() == 0) {
// throw new BadRequestException("未找到气涨轴规格「" + qzzSize + "」的暂存位");
// }
List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCache(qzzSize,
startPoint.getQzz_generation(), startPoint.getPoint_location());
if (shafttubeivts.size() == 0) {
stepTipLogs.add(">>>未找到气涨轴规格「" + qzzSize + "」的暂存位");
redisUtils.set("ERROR" + deviceCode, stepTipLogs);
throw new BadRequestException("未找到气涨轴规格「" + qzzSize + "」的暂存位");
}
BstIvtShafttubeivt pickWaitPoint = shafttubeivtService.getOne(new LambdaQueryWrapper<BstIvtShafttubeivt>()
.eq(BstIvtShafttubeivt::getPoint_location, startPoint.getPoint_location())
.eq(BstIvtShafttubeivt::getPoint_type, "7"));
@@ -660,7 +662,6 @@ public class SlitterServiceImpl implements SlitterService {
redisUtils.set("ERROR" + deviceCode, stepTipLogs);
throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的等待点位");
}
// BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
JSONObject taskParam = new JSONObject();
taskParam.put("point_code1", pickWaitPoint.getPoint_code());
taskParam.put("point_code2", startPoint.getPoint_code());