#
Junjie
2024-07-15 ff1fedd00c22aa232541f63ebcaa5a7f929b89b7
#
3个文件已修改
6 ■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
@@ -48,7 +48,9 @@
                    return Arrays.asList(
                            "sys_host",
                            "sys_user_role",
                            "sys_role_menu"
                            "sys_role_menu",
                            "wcs_bas_shuttle_err",
                            "wcs_bas_lift_err"
                    ).contains(tableName);
                }
            }
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java
@@ -218,7 +218,6 @@
        BasLiftErrService basLiftErrService = SpringUtils.getBean(BasLiftErrService.class);
        BasLiftErr liftErr = basLiftErrService.getOne(new LambdaQueryWrapper<BasLiftErr>()
                .eq(BasLiftErr::getErrorCode, this.errorCode)
                .eq(BasLiftErr::getHostId, this.device.getHostId())
                .eq(BasLiftErr::getDevicePlc, this.device.getDevicePlc()));
        if (liftErr != null) {
            return this.errorCode + "-" + liftErr.getErrName();
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
@@ -233,7 +233,6 @@
        BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
        BasShuttleErr shuttleErr = basShuttleErrService.getOne(new LambdaQueryWrapper<BasShuttleErr>()
                .eq(BasShuttleErr::getErrorCode, this.errorCode)
                .eq(BasShuttleErr::getHostId, this.device.getHostId())
                .eq(BasShuttleErr::getDevicePlc, this.device.getDevicePlc()));
        if (shuttleErr != null) {
            return this.errorCode + "-" + shuttleErr.getErrName();