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

opt: 1

Browse Source
This commit is contained in:
liyongde
2025-07-03 14:03:30 +08:00
parent a1d219ec6b
commit 8be4276360
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java
View File

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;
import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
@@ -115,13 +114,14 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
log.info("起点数据：{}", point1); log.info("起点数据：{}", point1);
log.info("终点数据：{}", point2); log.info("终点数据：{}", point2);
// 更新分切计划 // 更新分切计划
// 下来的分切计划状态：06 -> 09, 设置重量 // 下来的分切计划状态：06 -> 09, 不在需要设置重量
List<String> downCons = containers.toJavaList(String.class); List<String> downCons = containers.toJavaList(String.class);
log.info("即将下卷的上下轴的子卷号数据1：{}", downCons); log.info("即将下卷的上下轴的子卷号数据1：{}", downCons);
List<PdmBiSlittingproductionplan> downPlans = slittingproductionplanService.getByContainerNames(downCons); List<PdmBiSlittingproductionplan> downPlans = slittingproductionplanService.getByContainerNames(downCons);
log.info("即将下卷的上下轴的子卷号数据2：{}", downPlans); log.info("即将下卷的上下轴的子卷号数据2：{}", downPlans);
// SlitterTaskUtil.setPaperWeightStr(point1.getRemark(), downPlans); // SlitterTaskUtil.setPaperWeightStr(point1.getRemark(), downPlans);
log.info("即将下卷的上下轴的子卷号数据3：{}", downPlans); // log.info("即将下卷的上下轴的子卷号数据3：{}", downPlans);
// 下来的卷的集合
List<PdmBiSlittingproductionplan> needUpdates = new ArrayList<>(); List<PdmBiSlittingproductionplan> needUpdates = new ArrayList<>();
// 绑定气胀轴编码（可能没有气胀轴编码） // 绑定气胀轴编码（可能没有气胀轴编码）
List<PdmBiSlittingproductionplan> deviceUpPlans = downPlans.stream().filter(p -> SlitterConstant.SLITTER_SHAFT_UP.equals(p.getUp_or_down())).collect(Collectors.toList()); List<PdmBiSlittingproductionplan> deviceUpPlans = downPlans.stream().filter(p -> SlitterConstant.SLITTER_SHAFT_UP.equals(p.getUp_or_down())).collect(Collectors.toList());

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

@@ -73,11 +73,12 @@ public class AutoSendAirShaftAgvTask {
continue; continue;
} }
// 最多4条分切计划 // 最多4条分切计划
List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>() List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.in(PdmBiSlittingproductionplan::getQzzno, collect) .in(PdmBiSlittingproductionplan::getQzzno, collect)
.eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)); .eq(PdmBiSlittingproductionplan::getStatus, "01")
.eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO));
if (plans.size() == 0) { if (plans.size() == 0) {
log.info("找不到分切计划，送到异常处理位置！"); log.info("找不到状态01的分切计划，送到异常处理位置！");
// 不能抛异常，需要通过通知的形式，并且创建agv搬到异常处理位（4）。 // 不能抛异常，需要通过通知的形式，并且创建agv搬到异常处理位（4）。
// 判断套轴暂存位异常点位是否含有任务 // 判断套轴暂存位异常点位是否含有任务
List<BstIvtCutpointivt> exceptionPoints = bcutpointivtService.getAreaNotTaskPointByStatus("4", "1", "0", "0"); List<BstIvtCutpointivt> exceptionPoints = bcutpointivtService.getAreaNotTaskPointByStatus("4", "1", "0", "0");
@@ -95,7 +96,8 @@ public class AutoSendAirShaftAgvTask {
} else { } else {
log.info("异常处理位无空位！"); log.info("异常处理位无空位！");
// 点位禁用 // 点位禁用
cutPoint.setRemark("找不到分切计划！"); cutPoint.setRemark("计划状态已被改变！");
cutPoint.setIs_used("0");
cutPoint.setUpdate_time(DateUtil.now()); cutPoint.setUpdate_time(DateUtil.now());
bcutpointivtService.updateById(cutPoint); bcutpointivtService.updateById(cutPoint);
} }