义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
wangfei
2025-04-21 09402133807b1e774e658a13ad365b2e6efca25b 
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java


@@ -6,6 +6,7 @@


import com.baomidou.mybatisplus.core.toolkit.StringUtils;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.mes.common.config.Const;


import com.mes.common.config.ConstSysConfig;


import com.mes.glassinfo.entity.GlassInfo;


import com.mes.glassinfo.service.GlassInfoService;


import com.mes.hollow.entity.HollowBigStorageCage;


@@ -23,9 +24,9 @@


import com.mes.hollow.service.HollowBigStorageCageService;


import com.mes.hollow.service.HollowGlassOutRelationInfoService;


import com.mes.hollow.service.HollowGlassRelationInfoService;


import com.mes.sysconfig.service.SysConfigService;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


@@ -55,13 +56,15 @@


    HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;


    @Resource


    HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;


    @Value("${mes.slotWidth}")


    private Integer slotWidth;


    @Value("${mes.glassGap}")


    private Integer glassGap;




    @Value("${mes.outCarMaxSize}")


    private Integer outCarMaxSize;


    @Resource


    SysConfigService sysConfigService;


//    @Value("${mes.slotWidth}")


//    private Integer slotWidth;


//    @Value("${mes.glassGap}")


//    private Integer glassGap;


//


//    @Value("${mes.outCarMaxSize}")


//    private Integer outCarMaxSize;




    @Override


    public HollowBigStorageDTO queryHollowTargetSlot(String flowCardId, double width, double height, int totalLayer, int layer) {


@@ -100,6 +103,7 @@


                    .last("limit 1")


            );


        }


        Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);


        //详情表内获取本组是否已经有玻璃在笼子内（0表示提前占用）


        int taskCount = hollowGlassOutRelationInfoService.count(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()


                .eq(HollowGlassOutRelationInfo::getFlowCardId, flowCardId));


@@ -244,6 +248,10 @@


//        List<HollowBigStorageCage> hollowSlotList = HollowBigStorageCageService.list(new LambdaQueryWrapper<HollowBigStorageCage>()


//                .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth));


        //方式二：将玻璃按流程卡、尺寸、版图、版序 ，优先将格子全部补全后 依次计算后面的格子号




        Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);


        Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);


        Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);


        List<HollowGlassRelationInfo> relationInfoList = new ArrayList();


        List<List<HollowGlassRelationInfo>> tempHollowList = new ArrayList<>();


        int slotNumber = 1;