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

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

Browse Source
This commit is contained in:
zhouz
2025-06-13 15:20:10 +08:00
parent 7936ab91d0 c641eedbf3
commit d74f04a80f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,8 @@ public class AutoCallAirShaftTask extends Prun {
if (ObjectUtil.isEmpty(tzOKPlans)) {
stepStr += ",13";
log.info("计划找不到");
stepErrorInfo.add("找不到气胀轴：" + qzzs + "对应的计划。");
List<String> collect = halfPlacePoint.stream().map(BstIvtCutpointivt::getPoint_code).collect(Collectors.toList());
stepErrorInfo.add("找不到气胀[" + qzzs + "]对应的计划。请检查点位" + collect);
return;
}
PdmBiSlittingproductionplan oneTzOkPlan = tzOKPlans.get(0);
@@ -266,7 +267,7 @@ public class AutoCallAirShaftTask extends Prun {
.orElse(null);
if (planDto == null) {
log.warn("过滤3/6寸和代数输出结果为空，跳过此次套轴，直接拔轴。此时点位对应代数：{}", specification);
stepErrorInfo.add("过滤3/6寸和代数输出结果为空，跳过此次套轴，直接拔轴。此时点位对应代数：{}" + specification);
stepErrorInfo.add("过滤3/6寸和代数输出结果为空，跳过此次套轴，直接拔轴。此时点位对应代数[" + specification + "]");
// 如果不需要套轴，就只做拔轴
makePullShaft(empty, specification);
return;
@@ -392,7 +393,7 @@ public class AutoCallAirShaftTask extends Prun {
startPoint.setRemark("气胀轴" + oldQzzNo + "的计划不存在，无效点位自动禁用。");
startPoint.setUpdate_time(DateUtil.now());
bcutpointivtService.updateById(startPoint);
stepErrorInfo.add("当前气胀轴编码{" + oldQzzNo + "}，找不到对应的计划, 点位" + startPoint.getPoint_code() + "已被禁用。");
stepErrorInfo.add("当前气胀轴编码{" + oldQzzNo + "}，找不到对应的计划, 点位" + startPoint.getPoint_code() + "已被系统禁用。");
return;
}
// 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
@@ -428,7 +429,7 @@ public class AutoCallAirShaftTask extends Prun {
// 需要区分上下
List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize ,empty.getPoint_code(), location);
if (shafttubeivts.size() == 0) {
stepErrorInfo.add("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位");
stepErrorInfo.add("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位，此次不为[" + planD.getResource_name() + "]套轴");
log.error("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位");
return false;
}
@@ -443,7 +444,7 @@ public class AutoCallAirShaftTask extends Prun {
device_obj.put("product_area", "B1");
JSONObject pointStatus = wmsToAcsService.getPointStatus(device_rows);
if (ObjectUtil.isEmpty(pointStatus) || ObjectUtil.isEmpty(pointStatus.getJSONArray("data"))) {
stepErrorInfo.add("获取气胀轴库信息失败...");
stepErrorInfo.add("获取气胀轴库信息失败...此次不为[" + planD.getResource_name() + "]套轴");
log.error("获取气胀轴库信息失败");
return false;
}
@@ -471,7 +472,7 @@ public class AutoCallAirShaftTask extends Prun {
log.info("查找可以拔轴的点位数：{}", qzzPoint.size());
if (!judgment1 && !judgment2 && qzzPoint.size() == 0) {
log.warn("都没有气胀轴");
stepErrorInfo.add("已经没有空气胀轴了...");
stepErrorInfo.add("已经没有空气胀轴了，此次不为[" + planD.getResource_name() + "]套轴。");
return false;
}
return true;
@@ -897,7 +898,7 @@ public class AutoCallAirShaftTask extends Prun {
return true;
}
stepStr += ",4";
stepErrorInfo.add(">>>穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了...");
stepErrorInfo.add("穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了...");
return false;
}
}