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
王杰 1 year ago
parent 2bcd23eed4
commit 2a51392cd9
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/PartExtDao.java
Unescape Escape View File

@ -111,7 +111,7 @@ public class PartExtDao implements IPartExtDao {
public List<MesPartExtModel> queryPartByPager(MesPartExt partExt, Pager pager) {
StringBuffer hql = new StringBuffer();
hql.append(" select new " + MesPartExtModel.class.getName() + "(pe.id, pe.partNo, pe.partName, pe.briefText, pe.unit, " +
" pe.categoryCode1, pe.categoryCode2, pe.categoryCode3, pe.processMatchType, pe.packageMatchType, pe.qty2, " +
" pe.categoryCode1, pe.categoryCode2, pe.categoryCode3, pe.processMatchType, pe.productMatchType, pe.packageMatchType, pe.qty2, " +
" pe.pptCode, pe.colorCode, pe.colorName, pe.salesTo, pe.isOqc, pe.isCreateSn, pe.isPSParts, pe.standardWork, " +
" pe.japanDesc, pe.goodsCode, pe.prefix, pe.qualityAssureCode, pe.identifyCode, pe.snLastCode, pe.fileId, " +
" pe.fileOriginName, pe.uploadDatetime, pe.organizeCode, pe.createUser, pe.createDatetime, pe.modifyUser, pe.modifyDatetime, " +

3
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/PartExtDataService.java
Unescape Escape View File

@ -71,6 +71,7 @@ public class PartExtDataService implements IPartExtDataService {
for (MesPartExtModel item : partExtModelList) {
if (null != item) {
item.setProcessMatchTypeName(StringUtils.isEmpty(item.getProcessMatchType()) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.valueOfDescription(item.getProcessMatchType()));
item.setProductMatchTypeName(StringUtils.isEmpty(item.getProductMatchType()) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.valueOfDescription(item.getProductMatchType()));
item.setPackageMatchTypeName(StringUtils.isEmpty(item.getPackageMatchType()) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.valueOfDescription(item.getPackageMatchType()));
item.setIsOqcName(StringUtils.isEmpty(item.getIsOqc()) ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(item.getIsOqc()));
item.setIsCreateSnName(StringUtils.isEmpty(item.getIsCreateSn()) ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(item.getIsCreateSn()));
@ -237,6 +238,7 @@ public class PartExtDataService implements IPartExtDataService {
partExtDb.setCategoryCode2(partExt.getCategoryCode2());
partExtDb.setCategoryCode3(partExt.getCategoryCode3());
partExtDb.setProcessMatchType(partExt.getProcessMatchType());
partExtDb.setProductMatchType(partExt.getProductMatchType());
partExtDb.setPackageMatchType(partExt.getPackageMatchType());
partExtDb.setPackSpecCode(partExt.getPackSpecCode());
partExtDb.setPptCode(partExt.getPptCode());
@ -285,6 +287,7 @@ public class PartExtDataService implements IPartExtDataService {
MesPartExtModel partExtModel = new MesPartExtModel();
BeanUtils.copyProperties(partExt, partExtModel);
partExtModel.setProcessMatchTypeName(StringUtils.isEmpty(partExtModel.getProcessMatchType()) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.valueOfDescription(partExtModel.getProcessMatchType()));
partExtModel.setProductMatchTypeName(StringUtils.isEmpty(partExtModel.getProductMatchType()) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.valueOfDescription(partExtModel.getProductMatchType()));
partExtModel.setPackageMatchTypeName(StringUtils.isEmpty(partExtModel.getPackageMatchType()) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.valueOfDescription(partExtModel.getPackageMatchType()));
partExtModel.setIsOqcName(StringUtils.isEmpty(partExtModel.getIsOqc()) ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(partExtModel.getIsOqc()));
partExtModel.setIsCreateSnName(StringUtils.isEmpty(partExtModel.getIsCreateSn()) ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(partExtModel.getIsCreateSn()));

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

@ -203,14 +203,22 @@ public class PartExtExcelService implements IExcelImportExtService {
} catch (Exception var70) {
}
//包装编码匹配类型
String packageMatchType = null;
//产品编码匹配类型
String productMatchType = null;
try {
row.getCell(8).setCellType(CellType.STRING);
packageMatchType = row.getCell(8, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).getStringCellValue().trim();
productMatchType = row.getCell(8, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).getStringCellValue().trim();
} catch (Exception var68) {
}
// //包装编码匹配类型
// String packageMatchType = null;
// try {
// row.getCell(8).setCellType(CellType.STRING);
// packageMatchType = row.getCell(8, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).getStringCellValue().trim();
// } catch (Exception var68) {
// }
//包装数量
String qty2 = null;
try {
@ -489,12 +497,12 @@ public class PartExtExcelService implements IExcelImportExtService {
}
}
if (StringUtils.isEmpty(packageMatchType)) {
if (StringUtils.isEmpty(productMatchType)) {
++errorNum;
cellNum = cellNum + "I;";
errorInfo = errorInfo + "第I列数据必填;";
} else {
if (StringUtils.isEmpty(MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(packageMatchType))) {
if (StringUtils.isEmpty(MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(productMatchType))) {
++errorNum;
cellNum = cellNum + "I;";
errorInfo = errorInfo + "第I列数据无效;";
@ -711,7 +719,8 @@ public class PartExtExcelService implements IExcelImportExtService {
newPartExt.setCategoryCode2(StringUtils.isEmpty(categoryCode2) ? null : categoryCode2);
newPartExt.setCategoryCode3(StringUtils.isEmpty(categoryCode3) ? null : categoryCode3);
newPartExt.setProcessMatchType(StringUtils.isEmpty(processMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(processMatchType));
newPartExt.setPackageMatchType(StringUtils.isEmpty(packageMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(packageMatchType));
newPartExt.setProductMatchType(StringUtils.isEmpty(productMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(productMatchType));
// newPartExt.setPackageMatchType(StringUtils.isEmpty(packageMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(packageMatchType));
newPartExt.setQty2(StringUtils.isEmpty(qty2) ? null : Double.parseDouble(qty2));
newPartExt.setPptCode(pptCode);
newPartExt.setColorCode(colorCode);
@ -757,7 +766,8 @@ public class PartExtExcelService implements IExcelImportExtService {
mesPart.setCategoryCode2(StringUtils.isEmpty(categoryCode2) ? null : categoryCode2);
mesPart.setCategoryCode3(StringUtils.isEmpty(categoryCode3) ? null : categoryCode3);
mesPart.setProcessMatchType(StringUtils.isEmpty(processMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(processMatchType));
mesPart.setPackageMatchType(StringUtils.isEmpty(packageMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(packageMatchType));
mesPart.setProductMatchType(StringUtils.isEmpty(productMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(productMatchType));
// mesPart.setPackageMatchType(StringUtils.isEmpty(packageMatchType) ? null : MesExtEnumUtil.ENCODE_MATCH_TYPE.descriptionOfValue(packageMatchType));
mesPart.setQty2(StringUtils.isEmpty(qty2) ? null : Double.parseDouble(qty2));
mesPart.setPptCode(pptCode);
mesPart.setColorCode(colorCode);

9
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesPartExtModel.java
Unescape Escape View File

@ -55,12 +55,18 @@ public class MesPartExtModel implements Serializable {
@ApiParam("产品编码匹配类型")
private Integer processMatchType;
@ApiParam("产品编码匹配类型")
private Integer productMatchType;
@ApiParam("包装编码匹配类型")
private Integer packageMatchType;
@ApiParam("产品编码匹配类型")
private String processMatchTypeName;
@ApiParam("产品编码匹配类型")
private String productMatchTypeName;
@ApiParam("包装编码匹配类型")
private String packageMatchTypeName;
@ -210,7 +216,7 @@ public class MesPartExtModel implements Serializable {
}
public MesPartExtModel(Long id, String partNo, String partName, String briefText, String unit, String categoryCode1, String categoryCode2, String categoryCode3,
Integer processMatchType, Integer packageMatchType, Double qty2, String pptCode, String colorCode, String colorName,
Integer processMatchType, Integer productMatchType, Integer packageMatchType, Double qty2, String pptCode, String colorCode, String colorName,
String salesTo, Integer isOqc, Integer isCreateSn, Integer isPSParts, Double standardWork, String japanDesc, String goodsCode,
String prefix, String qualityAssureCode, String identifyCode, String snLastCode, Long fileId, String fileOriginName,
String uploadDatetime, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime,
@ -226,6 +232,7 @@ public class MesPartExtModel implements Serializable {
this.categoryCode2 = categoryCode2;
this.categoryCode3 = categoryCode3;
this.processMatchType = processMatchType;
this.productMatchType = productMatchType;
this.packageMatchType = packageMatchType;
this.qty2 = qty2;
this.pptCode = pptCode;

Write Preview
Loading…
Cancel
Save