jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

修改描述

Browse Source
tags/yfai-mes-ext-v1.0
LML丶 1 year ago
parent b543a5deb5
commit 5e6264b0cc
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

32
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesItemPartErrorPreventionExcelService.java
Unescape Escape View File

@ -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.api.iservice.busi.IExcelImportService;
import cn.estsh.i3plus.mes.apiservice.serviceimpl.busi.CommonService; 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.mes.apiservice.util.MesCommonUtil;
import cn.estsh.i3plus.platform.common.convert.ConvertBean; 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.platform.common.util.MesConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.MesItemPartErrorPrevention;
import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.model.ExcelImportErrorModel; 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.MesItemPartErrorPreventionRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.hssf.usermodel.HSSFDataFormat;
import org.apache.poi.ss.usermodel.Row; import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.ArrayList; import javax.persistence.EntityManager;
import java.util.HashMap; import java.text.SimpleDateFormat;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @Description : * @Description:
* @Reference : * @CreateDate 2022/6/27 17:28
* @Author : * @Author 尹肖
* @CreateDate : 2024-05-14 11:09 */
* @Modify:
**/
@Service @Service
@Slf4j @Slf4j
public class MesItemPartErrorPreventionExcelService implements IExcelImportService { 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++; errorNum++;
cellNum += "C;"; cellNum += "C;";
errorInfo += "第C列数据必填;"; errorInfo += "第C列数据必填;";

40
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java
Unescape Escape View File

@ -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.api.iservice.busi.IExcelImportService;
import cn.estsh.i3plus.mes.apiservice.serviceimpl.busi.CommonService; 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.mes.apiservice.util.MesCommonUtil;
import cn.estsh.i3plus.platform.common.convert.ConvertBean; 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.bean.MesPartPtr;
import cn.estsh.i3plus.pojo.mes.model.ExcelImportErrorModel; import cn.estsh.i3plus.pojo.mes.model.ExcelImportErrorModel;
import cn.estsh.i3plus.pojo.mes.model.ExcelImportResultModel; import cn.estsh.i3plus.pojo.mes.model.ExcelImportResultModel;
import cn.estsh.i3plus.pojo.mes.repository.MesPartPtrRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartPtrRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.hssf.usermodel.HSSFDataFormat;
import org.apache.poi.ss.usermodel.Row; import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.ArrayList; import javax.persistence.EntityManager;
import java.util.HashMap; import java.text.SimpleDateFormat;
import java.util.List; import java.util.*;
import java.util.Map;
/** /**
* @Description : * @Description:
* @Reference : * @CreateDate 2022/6/27 17:28
* @Author : * @Author 尹肖
* @CreateDate : 2024-05-14 11:09 */
* @Modify:
**/
@Service @Service
@Slf4j @Slf4j
public class MesPartPtrExcelService implements IExcelImportService { 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++; errorNum++;
cellNum += "A;"; cellNum += "A;";
errorInfo += "第A列数据必填;"; errorInfo += "第A列数据必填;";
} }
//校验原零件号 //校验原零件号
if (StringUtils.isEmpty(sourcePartNo)) { if (org.springframework.util.StringUtils.isEmpty(sourcePartNo)) {
errorNum++; errorNum++;
cellNum += "F;"; cellNum += "F;";
errorInfo += "第F列数据必填;"; errorInfo += "第F列数据必填;";
} }
//校验产线编号 //校验产线编号
if (StringUtils.isEmpty(targetPartNo)) { if (org.springframework.util.StringUtils.isEmpty(targetPartNo)) {
errorNum++; errorNum++;
cellNum += "G;"; cellNum += "G;";
errorInfo += "第G列数据必填;"; errorInfo += "第G列数据必填;";
} }
//校验替换零件号 //校验替换零件号
if (StringUtils.isEmpty(ptrProjectNo)) { if (org.springframework.util.StringUtils.isEmpty(ptrProjectNo)) {
errorNum++; errorNum++;
cellNum += "J;"; cellNum += "J;";
errorInfo += "第J列数据必填;"; errorInfo += "第J列数据必填;";
} }
//校验总成类型 //校验总成类型
if (StringUtils.isEmpty(partTypeCode)) { if (org.springframework.util.StringUtils.isEmpty(partTypeCode)) {
errorNum++; errorNum++;
cellNum += "L;"; cellNum += "L;";
errorInfo += "第L列数据必填;"; errorInfo += "第L列数据必填;";

Write Preview
Loading…
Cancel
Save