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-07-13 13:09:55 +08:00
parent 2c9b074efd
commit 2759ce1560
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,10 @@
resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto">
SELECT
p.resource_name,
p.parent_container_name,
CASE
WHEN LENGTH(p.parent_container_name) > 0 THEN p.parent_container_name
ELSE p.restruct_container_name
END AS parent_container_name,
p.split_group,
p.up_or_down,
p.qzz_size,
@@ -69,7 +72,7 @@
AND IFNULL(p.left_or_right,'') <![CDATA[ <> ]]> ''
GROUP BY
p.resource_name,
p.parent_container_name,
parent_container_name,
p.split_group,
p.up_or_down,
p.qzz_size,
@@ -82,7 +85,7 @@
num,
cn,
p.resource_name,
p.parent_container_name,
parent_container_name,
p.split_group,
p.up_or_down
</select>

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

@@ -156,6 +156,16 @@ public class AutoCallAirShaftTask {
.eq(PdmBiSlittingproductionplan::getSplit_group, planDto.getSplit_group())
.eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)
.eq(PdmBiSlittingproductionplan::getIs_paper_ok, SlitterConstant.SLITTER_YES));
if (needPlans.size() == 0) {
// 可能是改切，所以换成restruct_container_name来使用
needPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.eq(PdmBiSlittingproductionplan::getResource_name, planDto.getResource_name())
.eq(PdmBiSlittingproductionplan::getRestruct_container_name, planDto.getParent_container_name())
.eq(PdmBiSlittingproductionplan::getUp_or_down, planDto.getUp_or_down())
.eq(PdmBiSlittingproductionplan::getSplit_group, planDto.getSplit_group())
.eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)
.eq(PdmBiSlittingproductionplan::getIs_paper_ok, SlitterConstant.SLITTER_YES));
}
// 获取其中一条
PdmBiSlittingproductionplan needPlan = needPlans.get(0);
String qzzSize = needPlan.getQzz_size();