diff --git a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java index b4abec43f..07233e28f 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java +++ b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java @@ -84,7 +84,8 @@ public class MesProProcessController { public CommonResult> getProcessSimpleList() { List list = processService.getProcessListByStatus(CommonStatusEnum.ENABLE.getStatus()); return success(convertList(list, process -> new MesProProcessRespVO() - .setId(process.getId()).setName(process.getName()).setCode(process.getCode()))); + .setId(process.getId()).setName(process.getName()).setCode(process.getCode()) + .setAttention(process.getAttention()).setRemark(process.getRemark()))); } @GetMapping("/export-excel") diff --git a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java index 95ae23866..d307837ac 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java @@ -95,7 +95,7 @@ public class MesCalTeamMemberServiceImpl implements MesCalTeamMemberService { } private void validateUserExists(Long userId) { - if (adminUserApi.getUser(userId) == null) { + if (adminUserApi.getUser(userId).getCheckedData() == null) { throw exception(CAL_TEAM_MEMBER_USER_NOT_EXISTS); } } diff --git a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java index 3123709c0..07cf665eb 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java @@ -56,7 +56,7 @@ public class MesMdWorkstationWorkerServiceImpl implements MesMdWorkstationWorker private void validateWorkstationWorkerSaveData(Long id, MesMdWorkstationWorkerSaveReqVO reqVO) { // 校验岗位是否存在 - postApi.validPostList(Collections.singleton(reqVO.getPostId())); + postApi.validPostList(Collections.singleton(reqVO.getPostId())).getCheckedData(); // 校验同一工作站下岗位不重复(排除自身) MesMdWorkstationWorkerDO existing = workstationWorkerMapper.selectByWorkstationIdAndPostId( reqVO.getWorkstationId(), reqVO.getPostId()); diff --git a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java index 5539c8990..920ebf165 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java @@ -98,7 +98,7 @@ public class MesProAndonConfigServiceImpl implements MesProAndonConfigService { adminUserApi.validateUser(reqVO.getHandlerUserId()); } if (reqVO.getHandlerRoleId() != null) { - roleApi.validRoleList(Collections.singleton(reqVO.getHandlerRoleId())); + roleApi.validRoleList(Collections.singleton(reqVO.getHandlerRoleId())).getCheckedData(); } } diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/resources/sql/create_tables.sql b/yudao-module-mes/yudao-module-mes-server/src/test/resources/sql/create_tables.sql index 01cfa7123..a37c9e977 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/resources/sql/create_tables.sql +++ b/yudao-module-mes/yudao-module-mes-server/src/test/resources/sql/create_tables.sql @@ -369,9 +369,9 @@ CREATE TABLE IF NOT EXISTS "mes_qc_rqc" ( "critical_quantity" int DEFAULT 0, "major_quantity" int DEFAULT 0, "minor_quantity" int DEFAULT 0, - "critical_rate" decimal(5,2) DEFAULT 0.00, - "major_rate" decimal(5,2) DEFAULT 0.00, - "minor_rate" decimal(5,2) DEFAULT 0.00, + "critical_rate" decimal(14,2) DEFAULT 0.00, + "major_rate" decimal(14,2) DEFAULT 0.00, + "minor_rate" decimal(14,2) DEFAULT 0.00, "creator" varchar(64) DEFAULT '', "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, "updater" varchar(64) DEFAULT '', diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java index 948782dcd..a495d29df 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java @@ -69,7 +69,7 @@ public interface AdminUserApi extends AutoTransable { * @param id 用户编号 */ default void validateUser(Long id) { - validateUserList(Collections.singleton(id)); + validateUserList(Collections.singleton(id)).getCheckedData(); } @GetMapping(PREFIX + "/valid")