fix:优化分切BUG

This commit is contained in:
zhouz
2024-08-10 08:51:34 +08:00
parent 98a170ad0d
commit e164cdc0e3

View File

@@ -514,7 +514,7 @@ public class SlitterServiceImpl implements SlitterService {
getPointLocationInCutDevice(getNumberByResourceCode(demoPlan.getResource_name()), area));
if (emptyPoints.size() == 0) {
log.error("分切机【" + device.getExt_code() + "】找不到对应的对接位!");
throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位!😊");
throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位!");
}
// 枷锁
BstIvtCutpointivt emptyPoint = emptyPoints.get(0);
@@ -1005,7 +1005,7 @@ public class SlitterServiceImpl implements SlitterService {
// 如果是没货
throw new BadRequestException("点位:" + point.getPoint_code() + "检测空气胀轴,请确保下卷任务是否完毕后触发!");
}
if (ObjectUtil.isEmpty(point.getQzz_no1()) || ObjectUtil.isEmpty(point.getQzz_no2())) {
if (ObjectUtil.isEmpty(point.getQzz_no1()) && ObjectUtil.isEmpty(point.getQzz_no2())) {
throw new BadRequestException("点位:" + point.getPoint_code() + " 的气胀轴编码为空!");
}
List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",