diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml index e028ffe15..997024a17 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml @@ -70,6 +70,7 @@ AND p.is_delete = '0' AND IFNULL(p.up_or_down,'') ]]> '' AND IFNULL(p.left_or_right,'') ]]> '' + AND DATE(p.start_time) = CURDATE() GROUP BY p.resource_name, parent_container_name, diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index 0c9dd2dd3..134133676 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -37,6 +37,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -81,6 +82,8 @@ public class AutoCallAirShaftTask { @Autowired private ISysParamService paramService; + public final static String PARAM_CODE_PLAN_AREA = "PARAM_CODE_PLAN_AREA"; + /** * hint: 目前只是考虑了上区域 * 执行套轴和拔轴任务的逻辑处理。 @@ -103,10 +106,14 @@ public class AutoCallAirShaftTask { // 判断配置参数是否只做拔轴 // 2、获取分切计划数据 校验代数 todo: 顺序可能需要考虑 List planAll = slittingproductionplanService.getAllCutPlan(); + Param paramObj = paramService.findByCode(PARAM_CODE_PLAN_AREA); + String value = paramObj.getValue(); + List prefixList = Arrays.asList(value.split("[,,]")); List plans = planAll.stream() - .filter(p -> (p.getResource_name().startsWith("B5") || - p.getResource_name().startsWith("B6")) && - (checkComputationPoint(p) && checkHasTask(p))).collect(Collectors.toList()); + .filter(p -> prefixList.stream() + .anyMatch(prefix -> p.getResource_name().startsWith(prefix)) && + checkComputationPoint(p) && checkHasTask(p)) + .collect(Collectors.toList()); if (plans.size() == 0) { // 如果不需要套轴,就只做拔轴 makePullShaft(empty, specification);