From 5e6264b0ccbac750fcae98252126b7085ce43cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Tue, 14 May 2024 11:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesItemPartErrorPreventionExcelService.java | 32 ++++++++--------- .../serviceimpl/excel/MesPartPtrExcelService.java | 40 +++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesItemPartErrorPreventionExcelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesItemPartErrorPreventionExcelService.java index a417ce2..d95bd07 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesItemPartErrorPreventionExcelService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesItemPartErrorPreventionExcelService.java @@ -1,11 +1,15 @@ -package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel; +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel; import cn.estsh.i3plus.mes.api.iservice.busi.IExcelImportService; import cn.estsh.i3plus.mes.apiservice.serviceimpl.busi.CommonService; +import cn.estsh.i3plus.mes.apiservice.util.DateUtil; import cn.estsh.i3plus.mes.apiservice.util.MesCommonUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.tool.ExcelTool; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.MesConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.util.BaseRedis; import cn.estsh.i3plus.pojo.mes.bean.MesItemPartErrorPrevention; import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.model.ExcelImportErrorModel; @@ -13,28 +17,24 @@ import cn.estsh.i3plus.pojo.mes.model.ExcelImportResultModel; import cn.estsh.i3plus.pojo.mes.repository.MesItemPartErrorPreventionRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.hssf.usermodel.HSSFDataFormat; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.persistence.EntityManager; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; /** - * @Description : - * @Reference : - * @Author : - * @CreateDate : 2024-05-14 11:09 - * @Modify: - **/ + * @Description: + * @CreateDate 2022/6/27 17:28 + * @Author 尹肖 + */ @Service @Slf4j public class MesItemPartErrorPreventionExcelService implements IExcelImportService { @@ -150,7 +150,7 @@ public class MesItemPartErrorPreventionExcelService implements IExcelImportServi } //校验物料号 - if (StringUtils.isEmpty(partNo)) { + if (org.springframework.util.StringUtils.isEmpty(partNo)) { errorNum++; cellNum += "C;"; errorInfo += "第C列数据必填;"; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java index 1f4cc02..c326046 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java @@ -1,36 +1,36 @@ -package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel; +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel; import cn.estsh.i3plus.mes.api.iservice.busi.IExcelImportService; import cn.estsh.i3plus.mes.apiservice.serviceimpl.busi.CommonService; +import cn.estsh.i3plus.mes.apiservice.util.DateUtil; import cn.estsh.i3plus.mes.apiservice.util.MesCommonUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.tool.ExcelTool; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.pojo.base.util.BaseRedis; import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; import cn.estsh.i3plus.pojo.mes.model.ExcelImportErrorModel; import cn.estsh.i3plus.pojo.mes.model.ExcelImportResultModel; import cn.estsh.i3plus.pojo.mes.repository.MesPartPtrRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.hssf.usermodel.HSSFDataFormat; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.persistence.EntityManager; +import java.text.SimpleDateFormat; +import java.util.*; /** - * @Description : - * @Reference : - * @Author : - * @CreateDate : 2024-05-14 11:09 - * @Modify: - **/ + * @Description: + * @CreateDate 2022/6/27 17:28 + * @Author 尹肖 + */ @Service @Slf4j public class MesPartPtrExcelService implements IExcelImportService { @@ -286,32 +286,32 @@ public class MesPartPtrExcelService implements IExcelImportService { // } //校验产线编号 - if (StringUtils.isEmpty(workCenterCode)) { + if (org.springframework.util.StringUtils.isEmpty(workCenterCode)) { errorNum++; cellNum += "A;"; errorInfo += "第A列数据必填;"; } //校验原零件号 - if (StringUtils.isEmpty(sourcePartNo)) { + if (org.springframework.util.StringUtils.isEmpty(sourcePartNo)) { errorNum++; cellNum += "F;"; errorInfo += "第F列数据必填;"; } //校验产线编号 - if (StringUtils.isEmpty(targetPartNo)) { + if (org.springframework.util.StringUtils.isEmpty(targetPartNo)) { errorNum++; cellNum += "G;"; errorInfo += "第G列数据必填;"; } //校验替换零件号 - if (StringUtils.isEmpty(ptrProjectNo)) { + if (org.springframework.util.StringUtils.isEmpty(ptrProjectNo)) { errorNum++; cellNum += "J;"; errorInfo += "第J列数据必填;"; } //校验总成类型 - if (StringUtils.isEmpty(partTypeCode)) { + if (org.springframework.util.StringUtils.isEmpty(partTypeCode)) { errorNum++; cellNum += "L;"; errorInfo += "第L列数据必填;";