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

未排单，排单，优化生产，新需求接口修改

Browse Source
This commit is contained in:
liuzhaotian
2025-01-09 10:06:53 +08:00
parent 376af44963
commit d95d02f9bd
83 changed files with 5237 additions and 1680 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/api/systemconfig/SystemConfigApi.java
+18
View File
@@ -1,6 +1,7 @@
package com.cf.imes.module.system.api.systemconfig;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.module.system.api.systemconfig.dto.ProcessSchemeDTO;
import com.cf.imes.module.system.api.systemconfig.dto.SystemConfigRespDTO;
import com.cf.imes.module.system.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
@@ -8,6 +9,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
@@ -28,4 +32,18 @@ public interface SystemConfigApi {
@GetMapping(PREFIX + "/organ/custom-plateno-config/{id}")
@Operation(summary = "获取组织下自定义版编号配置")
CommonResult<SystemConfigRespDTO> getById(@PathVariable("id") Long id);
@GetMapping(PREFIX + "/organ/process-config-List")
@Operation(summary = "获取排单下的加工方案组的配置信息")
CommonResult<List<SystemConfigRespDTO>> getProcessByIds(@RequestParam("processIds") List<Long> processIds);
@GetMapping(PREFIX + "/organ/default-process-config")
@Operation(summary = "获取默认的加工方案组的配置信息")
CommonResult<SystemConfigRespDTO> getDefaultProcessConfig();
@GetMapping(PREFIX + "/organ/process-config")
@Operation(summary = "获取排单下加工方案组的配置信息和具体配置项的配置信息")
CommonResult<List<ProcessSchemeDTO>> getProcessById(@RequestParam("processId") Long processId);
}
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/dto/ProcessSchemeDTO.java
+76
View File
@@ -0,0 +1,76 @@
package com.cf.imes.module.system.api.systemconfig.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author 加工方案组配置
*/
@Schema(description = "RPC 服务 - 加工方案组的具体配置信息 Resp DTO")
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ProcessSchemeDTO implements Serializable {
private static final long serialVersionUID = 1788458794035807655L;
@Schema(description = "方案配置ID", requiredMode = Schema.RequiredMode.REQUIRED)
private Long planConfigId;
@Schema(description = "方案配置名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String planName;
@Schema(description = "加工分线配置ID", requiredMode = Schema.RequiredMode.REQUIRED)
private Long processLineConfig;
@Schema(description = "加工分线配置名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String processLineConfigName;
@Schema(description = "加工分线配置", requiredMode = Schema.RequiredMode.REQUIRED)
private String processLineConfigSetting;
@Schema(description = "数据优化配置ID", requiredMode = Schema.RequiredMode.REQUIRED)
private Long optimizationConfig;
@Schema(description = "数据优化配置名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String optimizationConfigName;
@Schema(description = "数据优化配置", requiredMode = Schema.RequiredMode.REQUIRED)
private String optimizationConfigSetting;
@Schema(description = "解析器配置ID", requiredMode = Schema.RequiredMode.REQUIRED)
private Long analyzer;
@Schema(description = "解析器配置名称-机台名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String analyzerConfigName;
@Schema(description = "解析器配置-机台的配置", requiredMode = Schema.RequiredMode.REQUIRED)
private String analyzerConfigSetting;
@Schema(description = "标签的配置", requiredMode = Schema.RequiredMode.REQUIRED)
private String labelSetting;
@Schema(description = "机台类型", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer machineType;
}
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+9 -3
View File
@@ -266,6 +266,8 @@ public class ErrorCodeConstants {
public static final ErrorCode PLATENO_ERROR = new ErrorCode(1_002_033_008, "当前板编号无对应包裹信息");
public static final ErrorCode PLATE_GOODS_ID_NOT_SAME = new ErrorCode(1_002_033_009, "板材商品编号存在，请重新命名商品编号");
public static final ErrorCode PLATE_IS_SOURCE = new ErrorCode(1_002_033_010, "当前板材为源小板，无法删除");
public static final ErrorCode PLAN_GOODS_IS_FILTER_DATA_ERROR = new ErrorCode(1_002_033_011, "当前排单为非混单，无法添加颜色的筛选条件");
public static final ErrorCode PLAN_STATUS_ERROR = new ErrorCode(1_002_033_012, "当前排单未投产，无法进行开料");
@@ -331,9 +333,13 @@ public class ErrorCodeConstants {
public static final ErrorCode BRANCHING_DEFAULT_SETTING_ERROR = new ErrorCode(1_002_041_023, "当前组织智能分线无默认配置，请进行配置");
public static final ErrorCode ADVANCED_SCREENING_CONFIG_ERROR = new ErrorCode(1_002_041_024, "当前筛选的配置有误，请重新进行配置");
public static final ErrorCode CONFIG_DATA_ERROR = new ErrorCode(1_002_041_025, "当前配置为空，保存失败，请添加配置后再保存");
public static final ErrorCode PLAN_MIXED_DATA_ERROR = new ErrorCode(1_002_041_021, "当前混排条件错误，无法混排，请重新选择条件进行混单！");
public static final ErrorCode PLAN_GOODS_DATA_ERROR = new ErrorCode(1_002_041_022, "当前排单未保存大板和小板信息，请重新进行排单");
public static final ErrorCode PLAN_MIXED_DATA_ERROR = new ErrorCode(1_002_041_026, "当前混排条件错误，无法混排，请重新选择条件进行混单！");
public static final ErrorCode PLAN_GOODS_DATA_ERROR = new ErrorCode(1_002_041_027, "当前排单未保存大板和小板信息，请重新进行排单");
public static final ErrorCode PLAN_PLATE_IS_CUTTED = new ErrorCode(1_002_041_028, "当前删除的小板中已有小板开料，无法删除！");
public static final ErrorCode PROCESS_CONFIG_DATA_ERROR = new ErrorCode(1_002_041_029, "当前方案组的优化数据未保存，请保存或重新执行方案组");
public static final ErrorCode PLAN_NO_ACTUAL_PLATE = new ErrorCode(1_002_041_030, "当前排单未选择实际开料的大板信息，无法保存优化结果");
public static final ErrorCode PROCESS_CONFIG_DEFAULT_DATA_ERROR = new ErrorCode(1_002_041_031, "当前组织没有默认的加工方案组，请在系统配置中进行配置");
public static final ErrorCode THIS_PROCESS_CONFIG_DATA_ERROR = new ErrorCode(1_002_041_032, "当前选择的加工方案组配置有误，请选择其他方案组或重新配置该方案组");