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
2025-02-22 14:14:20 +08:00
parent f5d512cd8e
commit ea1f664320
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java
+1 -1
View File
@@ -227,7 +227,7 @@ public class GlobalExceptionHandler {
// 文件格式错误处理 // 文件格式错误处理
if (rootCause instanceof IOException) { if (rootCause instanceof IOException) {
// 使用正则提取数值 // 使用正则提取数值
Pattern pattern = Pattern.compile("Numeric value \\((\\d+)\\) out of range"); Pattern pattern = Pattern.compile("Numeric value \\(([-+]?\\d*\\.?\\d+(?:[eE][-+]?\\d+)?)\\) out of range");
Matcher matcher = pattern.matcher(rootCause.getMessage()); Matcher matcher = pattern.matcher(rootCause.getMessage());
if (matcher.find()) { if (matcher.find()) {
String invalidValue = matcher.group(1); String invalidValue = matcher.group(1);
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.cf.imes.module.manage.service.plate; package com.cf.imes.module.manage.service.plate;
import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.context.AnalysisContext;
import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO;
import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO;
import com.cf.imes.module.manage.util.file.ExcelListener; import com.cf.imes.module.manage.util.file.ExcelListener;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -98,7 +99,7 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
* *
* @return 返回读取的数据集合 * @return 返回读取的数据集合
**/ **/
public List<PlateImportExcelVO> getDatas() { public List<PlateImportExcelVO> getDates() {
return datas; return datas;
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java
+3 -1
View File
@@ -368,6 +368,8 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand
@Override @Override
public void modifySystemConfig(ConfigSaveReqVO reqVO) { public void modifySystemConfig(ConfigSaveReqVO reqVO) {
// 记录当前版本配置状态
int status = getSystemConfig(reqVO.getId()).getStatus();
// 校验规则 // 校验规则
checkValid(reqVO.getSetting()); checkValid(reqVO.getSetting());
// 系统配置保存前操作 // 系统配置保存前操作
@@ -382,7 +384,7 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand
// 更新 // 更新
systemConfigMapper.updateById(systemConfigDO); systemConfigMapper.updateById(systemConfigDO);
} else { } else {
systemConfigDO = BeanUtils.toBean(reqVO, SystemConfigDO.class); systemConfigDO = BeanUtils.toBean(reqVO, SystemConfigDO.class).setStatus(status);
// 新增 // 新增
systemConfigMapper.insert(systemConfigDO); systemConfigMapper.insert(systemConfigDO);
} }