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

红外焊超差预警

Browse Source
uat-temp-wj-250124-equ-check-step
王杰 3 months ago
parent bf114910e2
commit 123ac16c08
3 changed files with 123 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentSpotCheckDetailService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.apiservice.utils.BeanMapUtilsExt;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@ -37,9 +38,10 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
private MesEquipmentVariableRepository mesEquipmentVariableRepository;
protected void setPackQueryBean(MesEquipmentSpotCheckDetail bean, DdlPackBean packBean) {
DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
DdlPreparedPack.getNumEqualPack(bean.getPid(), MesExtConstWords.PID, packBean);
DdlPreparedPack.getStringLikerPack(bean.getSpotCheckItemCode(), "spotCheckItemCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getSpotCheckItemName(), "spotCheckItemName", packBean);
DdlPreparedPack.getStringLikerPack(bean.getEquipCode(), MesExtConstWords.EQUIP_CODE, packBean);
DdlPreparedPack.getNumEqualPack(bean.getDataType(), "dataType", packBean);
DdlPreparedPack.getNumEqualPack(bean.getSpotCheckItemType(), "spotCheckItemType", packBean);
//43100 设备点检设置明细导入完成后，期望序列号可以正排
@ -53,7 +55,7 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
ValidatorBean.checkNotNull(item.getSpotCheckItemCode(), "点检项代码不能为空");
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), "pid", roadPackBean);
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.PID, roadPackBean);
DdlPreparedPack.getStringEqualPack(item.getSpotCheckItemCode(), "spotCheckItemCode", roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean);
if (flg) {
@ -63,6 +65,19 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
.setErrorDetail("点检项代码【%s】已经存在，请检查数据", item.getSpotCheckItemCode())
.build();
}
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
@Override
@ -71,9 +86,9 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
ValidatorBean.checkNotNull(item.getSpotCheckItemCode(), "点检项代码不能为空");
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), "pid", roadPackBean);
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.PID, roadPackBean);
DdlPreparedPack.getStringEqualPack(item.getSpotCheckItemCode(), "spotCheckItemCode", roadPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), MesExtConstWords.ID, roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
@ -82,6 +97,19 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
.setErrorDetail("点检项代码【%s】已经存在，请检查数据", item.getSpotCheckItemCode())
.build();
}
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
@Override
public void validateImport(List<MesEquipmentSpotCheckDetail> beanList) {
@ -91,7 +119,7 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
ValidatorBean.checkNotNull(item.getSpotCheckItemCode(), "点检项代码不能为空");
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), "pid", roadPackBean);
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.PID, roadPackBean);
DdlPreparedPack.getStringEqualPack(item.getSpotCheckItemCode(), "spotCheckItemCode", roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean);
if (flg) {
@ -101,6 +129,19 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
.setErrorDetail("点检项代码【%s】已经存在，请检查数据", item.getSpotCheckItemCode())
.build();
}
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
}
@Override
@ -125,19 +166,33 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
.build();
}
item.setPid(itemFlg.getId());
item.setEquipCode(itemFlg.getEquipCode());
}else {
ValidatorBean.checkNotNull(item.getId(), "点检项目id不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
DdlPreparedPack.getNumEqualPack(item.getId(), MesExtConstWords.ID, seriesPackBean);
if (!baseRDao.isExitByHql(seriesPackBean)) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("【%s】点检项目id不存在，请检查数据", item.getPid())
.setErrorDetail("【%s】点检项目id不存在，请检查数据", item.getId())
.build();
}
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
//实际值地址id
if (!Objects.isNull(variableMap) && !StringUtil.isEmpty(item.getRealValueAddress()) && variableMap.containsKey(item.getRealValueAddress())) {

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

@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@ -15,6 +16,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentSpotCheckRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,8 +35,39 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
@Override
protected void setPackQueryBean(MesEquipmentSpotCheckPart bean, DdlPackBean packBean) {
DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(bean.getPid(), MesExtConstWords.PID, packBean);
DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean);
DdlPreparedPack.getStringLikerPack(bean.getEquipCode(), MesExtConstWords.EQUIP_CODE, packBean);
}
@Override
protected void onInsertBean(MesEquipmentSpotCheckPart item) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
@Override
protected void onUpdateBean(MesEquipmentSpotCheckPart item) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
@Override
@ -52,9 +85,10 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
MesException.throwMesBusiException("点检项目代码【%s】不存在，请检查数据", item.getSpotCheckCode());
}
item.setPid(itemFlg.getId());
item.setEquipCode(itemFlg.getEquipCode());
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(item.getPartNo(),"partNo", partPackBean);
DdlPreparedPack.getStringEqualPack(item.getPartNo(), MesExtConstWords.PART_NO, partPackBean);
MesPart mesPart = mesPartRepository.getByProperty(partPackBean);
if (mesPart == null) {
MesException.throwMesBusiException("零件号【%s】不存在", item.getPartNo());
@ -64,12 +98,17 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
} else {
ValidatorBean.checkNotNull(item.getPid(), "点检项目id不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), "id", seriesPackBean);
if (!equipmentSpotCheckRepository.isExitByHql(seriesPackBean)) {
MesException.throwMesBusiException("点检项目id【%s】不存在，请检查数据", item.getPid());
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
item.setId(null);
item.setSystemSyncStatus(CommonEnumUtil.FALSE);
@ -93,15 +132,22 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
MesException.throwMesBusiException("点检项目代码【%s】不存在，请检查数据", item.getSpotCheckCode());
}
item.setPid(itemFlg.getId());
item.setEquipCode(itemFlg.getEquipCode());
} else {
ValidatorBean.checkNotNull(item.getPid(), "点检项目id不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), "id", seriesPackBean);
if (!equipmentSpotCheckRepository.isExitByHql(seriesPackBean)) {
MesException.throwMesBusiException("点检项目id【%s】不存在，请检查数据", item.getPid());
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
if (null == equipmentSpotCheck) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
.build();
}
item.setEquipCode(equipmentSpotCheck.getEquipCode());
}
}
return beanList;

2
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
Unescape Escape View File

@ -35,6 +35,8 @@ public class MesExtConstWords {
public static final String EQUIPMENT_CODE = "equipmentCode";
// 设备名称
public static final String EQUIPMENT_NAME = "equipmentName";
// 设备代码
public static final String EQUIP_CODE = "equipCode";
// 开模记录ID
public static final String MOULD_RECORD_ID = "mouldRecordId";
// 设备数据变量ID

Write Preview
Loading…
Cancel
Save