From 4cac05a412f3d341453c214ffb9c3d0734c29514 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Fri, 19 Apr 2024 17:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E6=9D=90=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/plate/PlateServiceImpl.java | 6 +-
.../imes/module/manage/service/plate/test.xml | 94 +++++++++++++++++++
.../system/enums/ErrorCodeConstants.java | 4 +-
.../vo/process/ProcessUserSaveReqVO.java | 2 +-
.../service/process/ProcessServiceImpl.java | 2 +-
5 files changed, 100 insertions(+), 8 deletions(-)
create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/test.xml
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
index 9566ca147..b55d1b9b8 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
@@ -46,12 +46,12 @@ public class PlateServiceImpl implements PlateService {
@Override
public Long createPlate(PlateSaveReqVO createReqVO) {
PlateDO plate = BeanUtils.toBean(createReqVO, PlateDO.class);
- if (createReqVO.getOrganId() != 0){
+ if (createReqVO.getOrganId() == 0 && createReqVO.getGoodsId() != null){
validateOrganExists(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();
}
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/test.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/test.xml
new file mode 100644
index 000000000..8f20ffa2c
--- /dev/null
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/test.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
index 683390efd..b926f5580 100644
--- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
@@ -37,9 +37,7 @@ public interface ErrorCodeConstants {
ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1_002_003_000, "用户账号已经存在");
ErrorCode USER_MOBILE_EXISTS = new ErrorCode(1_002_003_001, "手机号已经存在");
ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1_002_003_002, "邮箱已经存在");
- ErrorCode
-
- USER_NOT_EXISTS = new ErrorCode(1_002_003_003, "用户不存在");
+ ErrorCode USER_NOT_EXISTS = new ErrorCode(1_002_003_003, "用户不存在");
ErrorCode USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_003_004, "导入用户数据不能为空！");
ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1_002_003_005, "用户密码校验失败");
ErrorCode USER_IS_DISABLE = new ErrorCode(1_002_003_006, "名字为【{}】的用户已被禁用");
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java
index 725880a73..301b5cb84 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
@Data
@Valid
public class ProcessUserSaveReqVO {
- @Schema(description = "工序 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "161")
+ @Schema(description = "工序 ID", example = "161")
private Long id;
@Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java
index ed25c10ea..7219e43d7 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java
@@ -55,7 +55,7 @@ public class ProcessServiceImpl implements ProcessService {
// 插入
ProcessDO process = BeanUtils.toBean(createReqVO, ProcessDO.class);
processMapper.insert(process);
- if (createReqVO.getUsers() != "") {
+ if (createReqVO.getUsers() != "" && createReqVO.getUsers() != null) {
Long processID = process.getId();
String[] usersId = createReqVO.getUsers().split(",");
for (String user : usersId) {