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

add: 套轴区域选择、套轴计划为当天计划

Browse Source
This commit is contained in:
liyongde
2024-07-16 15:53:03 +08:00
parent 2ed32a6ab2
commit d9ad4a476a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
View File

@@ -70,6 +70,7 @@
AND p.is_delete = '0' AND p.is_delete = '0'
AND IFNULL(p.up_or_down,'') <![CDATA[ <> ]]> '' AND IFNULL(p.up_or_down,'') <![CDATA[ <> ]]> ''
AND IFNULL(p.left_or_right,'') <![CDATA[ <> ]]> '' AND IFNULL(p.left_or_right,'') <![CDATA[ <> ]]> ''
AND DATE(p.start_time) = CURDATE()
GROUP BY GROUP BY
p.resource_name, p.resource_name,
parent_container_name, parent_container_name,

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

@@ -37,6 +37,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -81,6 +82,8 @@ public class AutoCallAirShaftTask {
@Autowired @Autowired
private ISysParamService paramService; private ISysParamService paramService;
public final static String PARAM_CODE_PLAN_AREA = "PARAM_CODE_PLAN_AREA";
/** /**
* hint: 目前只是考虑了上区域 * hint: 目前只是考虑了上区域
* 执行套轴和拔轴任务的逻辑处理。 * 执行套轴和拔轴任务的逻辑处理。
@@ -103,10 +106,14 @@ public class AutoCallAirShaftTask {
// 判断配置参数是否只做拔轴 // 判断配置参数是否只做拔轴
// 2、获取分切计划数据 校验代数 todo： 顺序可能需要考虑 // 2、获取分切计划数据 校验代数 todo： 顺序可能需要考虑
List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan(); List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan();
Param paramObj = paramService.findByCode(PARAM_CODE_PLAN_AREA);
String value = paramObj.getValue();
List<String> prefixList = Arrays.asList(value.split("[，,]"));
List<SlitterPlanDistinctDto> plans = planAll.stream() List<SlitterPlanDistinctDto> plans = planAll.stream()
.filter(p -> (p.getResource_name().startsWith("B5") || .filter(p -> prefixList.stream()
p.getResource_name().startsWith("B6")) && .anyMatch(prefix -> p.getResource_name().startsWith(prefix)) &&
(checkComputationPoint(p) && checkHasTask(p))).collect(Collectors.toList()); checkComputationPoint(p) && checkHasTask(p))
.collect(Collectors.toList());
if (plans.size() == 0) { if (plans.size() == 0) {
// 如果不需要套轴，就只做拔轴 // 如果不需要套轴，就只做拔轴
makePullShaft(empty, specification); makePullShaft(empty, specification);