diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java index 38c9950dd..e610bc0b7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java @@ -129,4 +129,6 @@ public interface IPdmBiSlittingproductionplanService extends IService getByQzzNoByNoStatus(String qzzno); + + int getCountXN(String area, String location); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java index 2accf528c..4a81910aa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java @@ -17,4 +17,6 @@ public interface PdmBiSlittingproductionplanMapper extends BaseMapper getAllHalfPlan(List qzzs); List getCurrentPlanInfos(SlitterPlanDistinctDto dto); + + int getCountXN(String area, String location); } 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 30d17038a..a75fe5674 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 @@ -151,4 +151,14 @@ AND (p.parent_container_name = #{parent_container_name} OR restruct_container_name = #{parent_container_name}) AND p.split_group ]]> #{split_group} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java index a2f1eff72..6141a41b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java @@ -184,4 +184,9 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl canUsePoint = deliverycachepointivtService.list(new LambdaQueryWrapper() - .eq(Deliverycachepointivt::getProduct_area, area) - .eq(Deliverycachepointivt::getPoint_location, location) - .eq(Deliverycachepointivt::getIs_used, "1") - .eq(Deliverycachepointivt::getPoint_status, "01") - .like(Deliverycachepointivt::getCan_size, qzz_size)); - if (canUsePoint.size() < number) { - throw new BadRequestException("该半区该尺寸类型的位置剩余【" + canUsePoint.size() + "】个"); - } String qzz_generation = param.getString("qzz_generation"); StIvtCutpointivt xnDevice = cutpointivtService.getOne(new LambdaQueryWrapper() .eq(StIvtCutpointivt::getPoint_location, location) @@ -277,6 +267,18 @@ public class PaperTubeServiceImpl implements PaperTubeService { } // mes的设备号 String deviceCode = xnDevice.getExt_code(); + // 判断还有没有位置(没有就不给创建) + List canUsePoint = deliverycachepointivtService.list(new LambdaQueryWrapper() + .eq(Deliverycachepointivt::getProduct_area, area) + .eq(Deliverycachepointivt::getPoint_location, location) + .eq(Deliverycachepointivt::getIs_used, "1") + .eq(Deliverycachepointivt::getPoint_status, "01") + .like(Deliverycachepointivt::getCan_size, qzz_size)); + // 获取当前区域、位置的分切计划 + int planCount = pdmBiSlittingproductionplanService.getCountXN(area, location); + if (canUsePoint.size() < (number + planCount)) { + throw new BadRequestException("该半区该尺寸类型的位置剩余【" + canUsePoint.size() + "】个"); + } // 当前轴需要的管芯名称 ... String upLeftSizeK = param.getString("up_left_size_k"); String upRightSizeK = param.getString("up_right_size_k");