Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-24 1b4d0d08bec04e5c3af3e52f31535995f4665c81

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java

@@ -86,4 +86,16 @@
                .groupBy("state");
        return temperingMapper.selectList(wrapper);
    }

    @Override
    public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
        wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
                .lt("state",5);
        if (temperingMapper.update(temperingGlassInfo,wrapper) > 0) {
            return 200;
        }else {
            return 100;
        }
    }
}