义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-12-18 ea8859c58b8fd24a54f7a838d6f8eaa98d57fb65 
 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java


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


        if (null == hollowDetails) {


            storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()


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


                    .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())


                    .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())


                    .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));


            HollowBigStorageDTO storageDTO = new HollowBigStorageDTO();


@@ -108,7 +109,9 @@


            //表示序号没有或者  序号为1又不是第一块来的 新开一格


            storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()


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


                    .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness()).orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));


                    .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())


                    .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())


                    .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));


        } else {


            HollowBigStorageCageDetails beforeGlass = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()


                    .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)


@@ -119,6 +122,7 @@


            if (null == beforeGlass) {


                storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()


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


                        .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())


                        .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())


                        .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));


            } else {