diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index 3a4c9555e..cdc0e3841 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -31,11 +31,10 @@ FROM `bst_ivt_cutpointivt` bc LEFT JOIN pdm_bi_slittingproductionplan pp ON pp.qzzno = bc.qzz_no1 OR pp.qzzno = bc.qzz_no2 - LEFT JOIN st_ivt_cutpointivt sc ON sc.ext_code = pp.resource_name WHERE bc.point_type = #{type} AND pp.qzz_size = #{size} - AND sc.qzz_generation = #{generation} + AND pp.qzz_generation = #{generation} AND bc.is_used = '1' AND bc.point_status = '3' 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 b1c9dced2..456468995 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 @@ -10,7 +10,7 @@ p.split_group, p.up_or_down, p.qzz_size, - sc.qzz_generation, + p.qzz_generation, COALESCE ( count_table.num, 0 ) num, COALESCE ( ct1.cn, 0 ) AS cn, COALESCE ( ct2.cnn, 0 ) AS cnn @@ -60,8 +60,6 @@ AND p.parent_container_name = ct2.parent_container_name AND p.split_group = ct2.split_group AND p.up_or_down ]]> ct2.up_or_down - LEFT JOIN st_ivt_cutpointivt sc - ON sc.ext_code = p.resource_name WHERE p.`status` = '01' AND p.is_child_tz_ok = '0' @@ -75,7 +73,7 @@ p.split_group, p.up_or_down, p.qzz_size, - sc.qzz_generation, + p.qzz_generation, num, cn, cnn @@ -97,7 +95,7 @@ p1.up_or_down, '1' AS num, p1.qzz_size, - c.qzz_generation, + p1.qzz_generation, ROW_NUMBER() OVER ( PARTITION BY p1.parent_container_name, p1.split_group ORDER BY p1.resource_name @@ -124,16 +122,6 @@ AND p1.up_or_down ]]> p2.up_or_down AND p1.is_delete = '0' AND p1.is_paper_ok = '1' - LEFT JOIN - st_ivt_cutpointivt c - ON - c.ext_code = p1.resource_name - WHERE - p1.qzzno NOT IN - - #{item} - - OR p1.qzzno IS NULL ) SELECT resource_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 3bce7b377..c73817030 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 @@ -89,7 +89,7 @@ public class AutoCallAirShaftTask { // 标箔:1,锂电:2 改:大小:4代5代 String specification = empty.getQzz_generation(); String location = empty.getPoint_location(); - // 2、获取分切计划数据 + // 2、获取分切计划数据 校验代数 List plans = slittingproductionplanService.getAllCutPlan(); if (plans.size() == 0) { // 如果不需要套轴,就只做拔轴 @@ -113,7 +113,7 @@ public class AutoCallAirShaftTask { makePullShaft(empty, specification); return; } - // 从寻查找分切计划,并放在plans, 没有考虑区域问题 + // 从寻查找分切计划,并放在plans, 没有考虑区域问题, 里面会考虑代数 plans = slittingproductionplanService.getAllHalfPlan(qzzs); if (plans.size() == 0) { // 如果不需要套轴,就只做拔轴