Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

板材接口修改

Browse Source
This commit is contained in:
lym
2024-04-19 17:35:04 +08:00
parent 7b0290a038
commit 4cac05a412
5 changed files with 100 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
+3 -3
View File
@@ -46,12 +46,12 @@ public class PlateServiceImpl implements PlateService {
@Override @Override
public Long createPlate(PlateSaveReqVO createReqVO) { public Long createPlate(PlateSaveReqVO createReqVO) {
PlateDO plate = BeanUtils.toBean(createReqVO, PlateDO.class); PlateDO plate = BeanUtils.toBean(createReqVO, PlateDO.class);
if (createReqVO.getOrganId() != 0){ if (createReqVO.getOrganId() == 0 && createReqVO.getGoodsId() != null){
validateOrganExists(createReqVO.getOrganId()); validateOrganExists(createReqVO.getOrganId());
validateGoodExists(createReqVO.getGoodsId(), createReqVO.getOrganId()); validateGoodExists(createReqVO.getGoodsId(), createReqVO.getOrganId());
plate.setOrganId(createReqVO.getOrganId()); plate.setOrganId(OrganContextHolder.getOrganId());
} }
plateMapper.insert(plate.setOrganId(OrganContextHolder.getOrganId()));// 组织id未传输 plateMapper.insert(plate);// 组织id未传输
// 返回 // 返回
return plate.getId(); return plate.getId();
} }
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/test.xml
+94
View File
File diff suppressed because one or more lines are too long
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+1 -3
View File
@@ -37,9 +37,7 @@ public interface ErrorCodeConstants {
ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1_002_003_000, "用户账号已经存在"); ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1_002_003_000, "用户账号已经存在");
ErrorCode USER_MOBILE_EXISTS = new ErrorCode(1_002_003_001, "手机号已经存在"); ErrorCode USER_MOBILE_EXISTS = new ErrorCode(1_002_003_001, "手机号已经存在");
ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1_002_003_002, "邮箱已经存在"); ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1_002_003_002, "邮箱已经存在");
ErrorCode ErrorCode USER_NOT_EXISTS = new ErrorCode(1_002_003_003, "用户不存在");
USER_NOT_EXISTS = new ErrorCode(1_002_003_003, "用户不存在");
ErrorCode USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_003_004, "导入用户数据不能为空！"); ErrorCode USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_003_004, "导入用户数据不能为空！");
ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1_002_003_005, "用户密码校验失败"); ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1_002_003_005, "用户密码校验失败");
ErrorCode USER_IS_DISABLE = new ErrorCode(1_002_003_006, "名字为【{}】的用户已被禁用"); ErrorCode USER_IS_DISABLE = new ErrorCode(1_002_003_006, "名字为【{}】的用户已被禁用");
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java
+1 -1
View File
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
@Data @Data
@Valid @Valid
public class ProcessUserSaveReqVO { public class ProcessUserSaveReqVO {
@Schema(description = "工序 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "161") @Schema(description = "工序 ID", example = "161")
private Long id; private Long id;
@Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class ProcessServiceImpl implements ProcessService {
// 插入 // 插入
ProcessDO process = BeanUtils.toBean(createReqVO, ProcessDO.class); ProcessDO process = BeanUtils.toBean(createReqVO, ProcessDO.class);
processMapper.insert(process); processMapper.insert(process);
if (createReqVO.getUsers() != "") { if (createReqVO.getUsers() != "" && createReqVO.getUsers() != null) {
Long processID = process.getId(); Long processID = process.getId();
String[] usersId = createReqVO.getUsers().split(","); String[] usersId = createReqVO.getUsers().split(",");
for (String user : usersId) { for (String user : usersId) {