mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
新增webcad生产单导入:1、移除封边条配件对应逻辑;2、新增封边条宽度通过系统配置匹配宽度值逻辑;
This commit is contained in:
+3
@@ -55,4 +55,7 @@ public interface SystemConfigApi {
|
||||
@Operation(summary = "查询组织的混单是否开启")
|
||||
CommonResult<Boolean> getMultiColorConfigStatus();
|
||||
|
||||
@GetMapping(PREFIX + "/organ/sealedge-config")
|
||||
@Operation(summary = "获取组织下封边条对应配置")
|
||||
CommonResult<List<SystemConfigRespDTO>> getOrgSealEdgeConfig();
|
||||
}
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.cf.imes.module.system.api.systemconfig.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Gqr
|
||||
* @since 2025/3/21 11:16
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SystemConfigSealEdgeRespDTO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 4599625605797146076L;
|
||||
|
||||
/**
|
||||
* 宽最小值
|
||||
*/
|
||||
private int widthMin;
|
||||
|
||||
/**
|
||||
* 宽最大值
|
||||
*/
|
||||
private int widthMax;
|
||||
|
||||
/**
|
||||
* 宽取值a
|
||||
*/
|
||||
private int widthValue;
|
||||
}
|
||||
+10
@@ -16,12 +16,14 @@ import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO;
|
||||
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDataDO;
|
||||
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigProcessDO;
|
||||
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigSchemeDO;
|
||||
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigSealedgeDO;
|
||||
import com.cf.imes.module.system.dal.mysql.label.LabelMapper;
|
||||
import com.cf.imes.module.system.dal.mysql.machine.MachineMapper;
|
||||
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigDataMapper;
|
||||
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigMapper;
|
||||
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigProcessMapper;
|
||||
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigSchemeMapper;
|
||||
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigSealedgeMapper;
|
||||
import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum;
|
||||
import com.cf.imes.module.system.service.systemconfig.SystemConfigService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -72,6 +74,9 @@ public class SystemConfigApiImpl implements SystemConfigApi {
|
||||
@Resource
|
||||
private SystemConfigDataMapper systemConfigDataMapper;
|
||||
|
||||
@Resource
|
||||
private SystemConfigSealedgeMapper systemConfigSealedgeMapper;
|
||||
|
||||
@Override
|
||||
public CommonResult<SystemConfigRespDTO> getOrgCustomPlateNoConfig() {
|
||||
return success(BeanUtils.toBean(systemConfigService.getOrgCustomPlateNoConfig(), SystemConfigRespDTO.class));
|
||||
@@ -283,4 +288,9 @@ public class SystemConfigApiImpl implements SystemConfigApi {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public CommonResult<List<SystemConfigRespDTO>> getOrgSealEdgeConfig() {
|
||||
return success(BeanUtils.toBean(systemConfigSealedgeMapper.selectSystemConfigList(SystemConfigTypeEnum.SEALEDGE.getType(), null), SystemConfigRespDTO.class));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user