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

Merge remote-tracking branch 'origin/master_merge_0523' into master_merge_0523

Browse Source
This commit is contained in:
zhouz
2026-04-01 14:15:55 +08:00
parent f97b2edcb5 8c732c3898
commit b733f3713c
2 changed files with 24 additions and 23 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/auto/AutoCallAirShaftTask.java
View File

@@ -692,6 +692,7 @@ public class AutoCallAirShaftTask extends Prun {
if (ObjectUtil.isEmpty(one)) { if (ObjectUtil.isEmpty(one)) {
canMovePointList = canMovePointListAll; canMovePointList = canMovePointListAll;
} else { } else {
log.info("正在过滤另一台机构的管芯数据...");
// 把另一台机构所需要的管芯对应的位置过滤掉 // 把另一台机构所需要的管芯对应的位置过滤掉
List<String> otherTubes = Stream.of(one.getTube_code1(), one.getTube_code2()).filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); List<String> otherTubes = Stream.of(one.getTube_code1(), one.getTube_code2()).filter(ObjectUtil::isNotEmpty).collect(Collectors.toList());
canMovePointList = canMovePointListAll.stream().filter(bh -> { canMovePointList = canMovePointListAll.stream().filter(bh -> {
@@ -729,7 +730,7 @@ public class AutoCallAirShaftTask extends Prun {
stepErrorInfo.add("备货区正在搬运管芯过来，托盘号：[" + needPoint.getVehicle_code() + "]。"); stepErrorInfo.add("备货区正在搬运管芯过来，托盘号：[" + needPoint.getVehicle_code() + "]。");
return 1; return 1;
} }
// 3.2 判断是否有单独拉出去的任务，有的话直接拉过来。 // 3.2 判断是否有单独拉出去的任务，有的话直接拉过来。（010816的任务）
List<BstIvtStockingivt> stockingivts = stockingivtService.getMoveTaskPoints(); List<BstIvtStockingivt> stockingivts = stockingivtService.getMoveTaskPoints();
if (CollectionUtil.isNotEmpty(stockingivts)) { if (CollectionUtil.isNotEmpty(stockingivts)) {
// 判断当前这个拉出去的点位有没有拉进来的任务 // 判断当前这个拉出去的点位有没有拉进来的任务

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

@@ -436,27 +436,27 @@ public class SlitterServiceImpl implements SlitterService {
return res; return res;
} }
// 找套轴对接位（任取一个空点） // 找套轴对接位（任取一个空点）
exceptionPointCodes = bcutpointivtService.getCanUseMinPointByShelfSpecial("1", "0"); // exceptionPointCodes = bcutpointivtService.getCanUseMinPointByShelfSpecial("1", "0");
if (exceptionPointCodes.size() > 0) { // if (exceptionPointCodes.size() > 0) {
String exceptionPoint = exceptionPointCodes.get(0); // String exceptionPoint = exceptionPointCodes.get(0);
JSONObject exParam = new JSONObject(); // JSONObject exParam = new JSONObject();
exParam.put("point_code1", startPoint.getPoint_code()); // exParam.put("point_code1", startPoint.getPoint_code());
exParam.put("point_code2", exceptionPoint); // exParam.put("point_code2", exceptionPoint);
if (exceptionPoint.endsWith("A")) { // if (exceptionPoint.endsWith("A")) {
exParam.put("vehicle_code1", collect); // exParam.put("vehicle_code1", collect);
} else { // } else {
exParam.put("vehicle_code2", collect); // exParam.put("vehicle_code2", collect);
} // }
exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务")); // exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务"));
exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); // exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
exParam.put("acs_task_type", "6"); // exParam.put("acs_task_type", "6");
exParam.put("qzz_size", startPoint.getQzz_size()); // exParam.put("qzz_size", startPoint.getQzz_size());
exParam.put("containers", collect); // exParam.put("containers", collect);
sendNBJExceptionPointTask.createTask(exParam); // sendNBJExceptionPointTask.createTask(exParam);
res.put("status", HttpStatus.HTTP_OK); // res.put("status", HttpStatus.HTTP_OK);
res.put("message", "创建送至对接位等待异常处理位!"); // res.put("message", "创建送至对接位等待异常处理位!");
return res; // return res;
} // }
// 半条任务等待补齐 // 半条任务等待补齐
stepTipLogs.add("套轴完成->[" + collect + "]对应的分切计划状态已更改，无暂存位置，创建任务失败!"); stepTipLogs.add("套轴完成->[" + collect + "]对应的分切计划状态已更改，无暂存位置，创建任务失败!");
@@ -647,7 +647,7 @@ public class SlitterServiceImpl implements SlitterService {
String qzzSize = param.getString("size"); String qzzSize = param.getString("size");
// 判断是否有未完成的任务 // 判断是否有未完成的任务
List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>() List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.eq(SchBaseTask::getPoint_code1, deviceCode) .eq(SchBaseTask::getPoint_code2, deviceCode)
.lt(SchBaseTask::getTask_status, "07")); .lt(SchBaseTask::getTask_status, "07"));
if (list.size() > 0) { if (list.size() > 0) {
stepTipLogs.add(">>>气胀轴出库请求异常：点位[" + deviceCode + "]存在未完成的任务，无法创建从气涨轴暂存位取轴的任务！"); stepTipLogs.add(">>>气胀轴出库请求异常：点位[" + deviceCode + "]存在未完成的任务，无法创建从气涨轴暂存位取轴的任务！");