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-13 21:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增配件管理、板材详情

Browse Source
This commit is contained in:
lym
2024-11-08 09:24:34 +08:00
parent e16583e3a8
commit 7c24a7453c
53 changed files with 2648 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+1
View File
@@ -243,6 +243,7 @@ public class ErrorCodeConstants {
public static final ErrorCode PROCESS_GROUP_NAME_EXISTS = new ErrorCode(1_002_032_003, "工序名称已存在");
public static final ErrorCode PROCESS_GROUP_CUTTING_ERROR = new ErrorCode(1_002_032_004, "开料工序类型已经存在，禁止重复");
public static final ErrorCode PROCESS_GROUP_PACKING_ERROR = new ErrorCode(1_002_032_005, "打包工序类型已经存在，禁止重复");
public static final ErrorCode PROCESS_ITEM_NOT_EXISTS = new ErrorCode(1_002_032_006, "工序信息不存在");
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java
+5 -3
View File
@@ -65,9 +65,11 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
// 判断重复
int isCutting = 0;
int isPacking = 0;
if (createReqVO.getItems() != null) {
if (createReqVO.getItems() == null) {
throw exception(PROCESS_ITEM_NOT_EXISTS);
}
List<String> list = cuttingItems(createReqVO.getItems());
if (list.size() > 0) {
if (!list.isEmpty()) {
for (String item : list) {
ProcessDO process = processMapper.selectOneById(Long.valueOf(item), OrganContextHolder.getOrganId());
if (process.getType() == ProcessTypeEnum.TYPE_ONE.getStatus()){
@@ -78,7 +80,7 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
}
}
}
}
if (isCutting > 1){
throw exception(PROCESS_GROUP_CUTTING_ERROR);
}
cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml
+3
View File
@@ -77,6 +77,9 @@ spring:
bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔
elasticsearch:
uris: 192.168.1.205:9200
security-http-ssl-enable: false
username: elastic
password: admin.
--- #################### 定时任务相关配置 ####################
xxl: