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

feat：添加日志描述

Browse Source
This commit is contained in:
liyongde
2024-07-24 11:21:51 +08:00
parent 5bf31101b1
commit cf62dbe85c
3 changed files with 9 additions and 0 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/SlitterDownTrussTask.java
View File

@@ -102,6 +102,8 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
point1 = cutpointivtService.getPintByUpOrDownCode(pointCode2, false); point1 = cutpointivtService.getPintByUpOrDownCode(pointCode2, false);
point2 = bcutpointivtService.getPintByTrussCode(pointCode1, false); point2 = bcutpointivtService.getPintByTrussCode(pointCode1, false);
} }
log.info("起点数据：{}", point1);
log.info("终点数据：{}", point2);
String tmpUpQzzNo = point1.getUp_qzzno(); String tmpUpQzzNo = point1.getUp_qzzno();
String tmpDownQzzNo = point1.getDown_qzzno(); String tmpDownQzzNo = point1.getDown_qzzno();
// 更新分切计划 // 更新分切计划
@@ -112,6 +114,7 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
TaskUtils.updateOptMessageBySlitterPlan(p); TaskUtils.updateOptMessageBySlitterPlan(p);
List<String> downQzzNos = Stream.of(tmpUpQzzNo, tmpDownQzzNo) List<String> downQzzNos = Stream.of(tmpUpQzzNo, tmpDownQzzNo)
.filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
log.info("即将下卷的上下轴的气胀轴编码数据：{}", downQzzNos);
slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>() slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.in(PdmBiSlittingproductionplan::getQzzno, downQzzNos)); .in(PdmBiSlittingproductionplan::getQzzno, downQzzNos));
// 上去的分切计划状态：04 -> 05 // 上去的分切计划状态：04 -> 05
@@ -119,6 +122,7 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
p.setEnd_time(""); p.setEnd_time("");
List<String> upQzzNos = Stream.of(point2.getQzz_no1(), point2.getQzz_no2()) List<String> upQzzNos = Stream.of(point2.getQzz_no1(), point2.getQzz_no2())
.filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
log.info("即将上卷的气胀轴编码数据：{}", upQzzNos);
if (upQzzNos.size() > 0) { if (upQzzNos.size() > 0) {
slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>() slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.in(PdmBiSlittingproductionplan::getQzzno, upQzzNos)); .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos));

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

@@ -453,6 +453,7 @@ public class AutoCallAirShaftTask {
* @param specification 代数（4、5） * @param specification 代数（4、5）
*/ */
private void makePullShaft(BstIvtShafttubeivt empty, String specification) { private void makePullShaft(BstIvtShafttubeivt empty, String specification) {
log.info("不需要套轴，只做拔轴！");
List<BstIvtCutpointivt> notTaskPoints = bcutpointivtService.getAreaNotTaskPointByLocationAreaAndStatus(empty.getPoint_location()); List<BstIvtCutpointivt> notTaskPoints = bcutpointivtService.getAreaNotTaskPointByLocationAreaAndStatus(empty.getPoint_location());
if (notTaskPoints.size() == 0) { if (notTaskPoints.size() == 0) {
return; return;

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

@@ -81,6 +81,10 @@ public class AutoUpShaftTrussTask {
// 获取下一组分切计划 // 获取下一组分切计划
List<String> qzzNos = Stream.of(newCutPoint.getQzz_no1(), newCutPoint.getQzz_no2()) List<String> qzzNos = Stream.of(newCutPoint.getQzz_no1(), newCutPoint.getQzz_no2())
.filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
if (qzzNos.size() == 0) {
log.warn("{} - 气胀轴编码未找到，跳到下一个点位！", newCutPoint);
return;
}
List<PdmBiSlittingproductionplan> nextPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>() List<PdmBiSlittingproductionplan> nextPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.in(PdmBiSlittingproductionplan::getQzzno, qzzNos) .in(PdmBiSlittingproductionplan::getQzzno, qzzNos)
.eq(PdmBiSlittingproductionplan::getStatus, "03") .eq(PdmBiSlittingproductionplan::getStatus, "03")