diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java index 71a22fc97..6fbaf4ff8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java @@ -17,6 +17,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproducti import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; @@ -111,14 +112,15 @@ public class TrussCallAirShaftTask extends AbstractAcsTask { .eq(PdmBiSlittingproductionplan::getResource_name, planDistinctDto.getResource_name()) .eq(PdmBiSlittingproductionplan::getParent_container_name, planDistinctDto.getParent_container_name()) .eq(PdmBiSlittingproductionplan::getUp_or_down, planDistinctDto.getUp_or_down()) + .eq(PdmBiSlittingproductionplan::getSplit_group, planDistinctDto.getSplit_group()) .eq(PdmBiSlittingproductionplan::getIs_paper_ok, "2")); if (needPlans.size() == 0) { throw new BadRequestException("找不到气涨轴编码【" + task.getVehicle_code() + "】对应的气涨轴"); } for (PdmBiSlittingproductionplan plan : needPlans) { - if ("1".equals(plan.getLeft_or_right())) { + if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) { // 左卷 - if ("1".equals(plan.getPaper_tube_or_FRP())) { + if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) { endPointObj.setTube_code1(plan.getPaper_tube_material()); endPointObj.setTube_name1(plan.getPaper_tube_model()); } else { @@ -128,12 +130,12 @@ public class TrussCallAirShaftTask extends AbstractAcsTask { endPointObj.setContainer_name1(plan.getContainer_name()); } else { // 右卷 - if ("1".equals(plan.getPaper_tube_or_FRP())) { - endPointObj.setTube_code1(plan.getPaper_tube_material()); - endPointObj.setTube_name1(plan.getPaper_tube_model()); + if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) { + endPointObj.setTube_code2(plan.getPaper_tube_material()); + endPointObj.setTube_name2(plan.getPaper_tube_model()); } else { - endPointObj.setTube_code1(plan.getFRP_material()); - endPointObj.setTube_name1(plan.getFRP_model()); + endPointObj.setTube_code2(plan.getFRP_material()); + endPointObj.setTube_name2(plan.getFRP_model()); } endPointObj.setContainer_name2(plan.getContainer_name()); }