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

fix:优化分切BUG

Browse Source
This commit is contained in:
zhouz
2024-08-10 08:51:34 +08:00
parent 98a170ad0d
commit e164cdc0e3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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