yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

pull/245/MERGE
YunaiV 2026-04-06 22:48:51 +08:00
parent d9b57e6897 2eb326d62d
commit 86087983a7
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java
View File

@ -84,7 +84,8 @@ public class MesProProcessController {
public CommonResult<List<MesProProcessRespVO>> getProcessSimpleList() {
List<MesProProcessDO> 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")

2
yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java
View File

@ -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);
}
}

2
yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java
View File

@ -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());

2
yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java
View File

@ -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();
}
}

6
yudao-module-mes/yudao-module-mes-server/src/test/resources/sql/create_tables.sql
View File

@ -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 '',

2
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
View File

@ -69,7 +69,7 @@ public interface AdminUserApi extends AutoTransable<AdminUserRespDTO> {
* @param id 用户编号
*/
default void validateUser(Long id) {
validateUserList(Collections.singleton(id));
validateUserList(Collections.singleton(id)).getCheckedData();
}
@GetMapping(PREFIX + "/valid")