Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java

@@ -129,13 +129,13 @@
    @Override
    public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage) {
        EdgStorageCage edgItem = baseMapper.selectById(edgStorageCage.getId());
        if(edgItem!=null){
        if (edgItem != null) {
            edgItem.setEnableState(edgStorageCage.getEnableState());
            baseMapper.updateById(edgItem);
            log.info("卧室缓存：【启用/禁用】 参数:{} 结果:成功",edgStorageCage);
            log.info("卧室缓存：【启用/禁用】 参数:{} 结果:成功", edgStorageCage);
            return true;
        }
        log.info("卧室缓存：【启用/禁用】 参数:{} 结果:失败",edgStorageCage);
        log.info("卧室缓存：【启用/禁用】 参数:{} 结果:失败", edgStorageCage);
        return false;
    }

@@ -153,15 +153,20 @@
        EdgStorageCageDetails edgDItem = edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
        if (edgItem != null) {
            //移除  （破损,目前两个概念混合在一起,建议拆开）
            EdgStorageCageDetails result = edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, edgStorageCageId));
            EdgStorageCageDetails result = edgStorageCageDetailsMapper.selectOne(
                    new MPJLambdaWrapper<EdgStorageCageDetails>()
                            .eq(EdgStorageCageDetails::getSlot, edgStorageCageId)
                            .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
            );
            if (result != null) {
                result.setSlot(0);
                result.setState(201);
                Damage damage =new Damage();
                Damage damage = new Damage();
                damage.setGlassId(edgStorageCageDetails.getGlassId());
                damage.setLine(1002);
                damage.setWorkingProcedure("卧式理片");
                damage.setStatus(2);
                damage.setLine(2001);
                damage.setWorkingProcedure("磨边");
                damage.setStatus(1);
                damage.setType(8);
                damageService.insertDamage(damage);
                edgStorageCageDetailsMapper.updateById(result);
            }