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-01-03 18:43:39 +08:00
parent 3865da1cb7
commit da3edc1ca1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
View File

@@ -72,6 +72,7 @@
AND IFNULL(p.left_or_right,'') <![CDATA[ <> ]]> '' AND IFNULL(p.left_or_right,'') <![CDATA[ <> ]]> ''
AND DATE(p.start_time) >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY) AND DATE(p.start_time) >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY)
AND p.FRP_description NOT LIKE '%1800%' AND p.FRP_description NOT LIKE '%1800%'
AND '1' = (SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name)
GROUP BY GROUP BY
p.resource_name, p.resource_name,
p.parent_container_name, p.parent_container_name,

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

@@ -199,21 +199,21 @@ public class AutoCallAirShaftTask {
// todo: 需要校验区域0/1 // todo: 需要校验区域0/1
List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification); List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification);
if (qzzPoint.size() == 0) { if (qzzPoint.size() == 0) {
// 调用ACS滚条气涨轴下来
toAcsOutShaft(qzzSize, location, empty);
// 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划 // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
saveCutPlanMessage(empty, needPlans, qzzSize); saveCutPlanMessage(empty, needPlans, qzzSize);
// 调用ACS滚条气涨轴下来
toAcsOutShaft(qzzSize, location, empty);
toCallAgvMovePaperTube(needPlans, location, empty); toCallAgvMovePaperTube(needPlans, location, empty);
return; return;
} }
// 查找一条没任务的点位 // 查找一条没任务的点位
BstIvtCutpointivt startPoint = qzzPoint.get(0); BstIvtCutpointivt startPoint = qzzPoint.get(0);
if (ObjectUtil.isEmpty(startPoint)) { if (ObjectUtil.isEmpty(startPoint)) {
// 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
saveCutPlanMessage(empty, needPlans, qzzSize);
// 如果不存在，则发起信号滚气涨轴 // 如果不存在，则发起信号滚气涨轴
// 调用ACS滚条气涨轴下来 // 调用ACS滚条气涨轴下来
toAcsOutShaft(qzzSize, location, empty); toAcsOutShaft(qzzSize, location, empty);
// 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
saveCutPlanMessage(empty, needPlans, qzzSize);
toCallAgvMovePaperTube(needPlans, location, empty); toCallAgvMovePaperTube(needPlans, location, empty);
return; return;
} }