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

fix: 套管下发任务的时候需要携带需要的纸管信息和当前纸管信息

Browse Source
This commit is contained in:
liyongde
2024-04-11 14:46:34 +08:00
parent 5387ed5419
commit c9d2be2405
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ public class AutoCallAirShaftTask {
param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位"));
param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
param.put("qzz_size", needPlan.getQzz_size());
// 纸管规格
// 所需的纸管规格
for (PdmBiSlittingproductionplan plan : needPlans) {
if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
@@ -159,6 +159,33 @@ public class AutoCallAirShaftTask {
}
}
}
// 当前纸管的规格信息
String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
? startPoint.getQzz_no1() : startPoint.getQzz_no2();
if (oldQzzNo == null) {
throw new BadRequestException("当前气胀轴的编码为空！");
}
// 最多两条
List<PdmBiSlittingproductionplan> oldPlans = slittingproductionplanService.getByQzzNo(oldQzzNo);
for (PdmBiSlittingproductionplan plan : oldPlans) {
if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
param.put("currentLeft", plan.getPaper_tube_model());
} else {
param.put("currentLeft", plan.getFRP_model());
}
} else {
if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
param.put("currentRight", plan.getPaper_tube_model());
} else {
param.put("currentRight", plan.getFRP_model());
}
}
}
// 套管数量
param.put("casingCount", needPlans.size());
// 拔管数量
param.put("pullCount", oldPlans.size());
trussCallAirShaftTask.createTask(param);
// 将分切计划is_paper_ok 1(纸管已经准备好) -> 2(已经套轴)
needPlans.forEach(p -> {