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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
tags/yfai-mes-ext-v1.0
jun 11 months ago
parent 5b3b9f15a2 6c20420829
commit 1424806cf8
4 changed files with 81 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java
Unescape Escape View File

@ -87,7 +87,7 @@ public class MesMediaFileCfgController extends BaseMesController<MesMediaFileCfg
}
String fileName = file.getOriginalFilename();
PutObjectResult putObjectResult = HuaWeiOBSUtil.putObjectByMultipartFile(MesCommonConstant.OBS_END_POINT, fileName, file);
PutObjectResult putObjectResult = HuaWeiOBSUtil.putObjectByMultipartFile(MesCommonConstant.OBS_BUCKET_NAME, fileName, file);
String objectUrl = putObjectResult.getObjectUrl();

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

@ -1,9 +1,13 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartTransferDetailService;
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;
import cn.estsh.i3plus.pojo.mes.bean.MesPartTransferDetail;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -16,7 +20,38 @@ public class MesPartTransferDetailService extends BaseMesService<MesPartTransfer
DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(),"custPartNo",packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(),"custOrganizeCode",packBean);
DdlPreparedPack.getStringEqualPack(bean.getFeatureNo(),"featureNo",packBean);
DdlPreparedPack.getStringEqualPack(bean.getMessageNo(),"messageNo",packBean);
DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean);
}
@Override
protected void onInsertBean(MesPartTransferDetail item) {
// 数据校验
ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "partNo不能为空");
ValidatorBean.checkNotNull(item.getCustPartNo(), "custPartNo不能为空" );
ValidatorBean.checkNotNull(item.getFeatureNo(), "featureNo不能为空");
// ValidatorBean.checkNotNull(item.getCustCode(), "custCode不能为空" );
// ValidatorBean.checkNotNull(item.getMessageNo(), "messageNo不能为空");
// ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "custOrganizeCode不能为空" );
//唯一性校验
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPartNo(),"partNo",packBean);
DdlPreparedPack.getStringEqualPack(item.getCustPartNo(),"custPartNo",packBean);
DdlPreparedPack.getStringEqualPack(item.getFeatureNo(),"featureNo",packBean);
// DdlPreparedPack.getStringEqualPack(item.getCustOrganizeCode(),"custOrganizeCode",packBean);
// DdlPreparedPack.getStringEqualPack(item.getMessageNo(),"messageNo",packBean);
// DdlPreparedPack.getStringEqualPack(item.getCustCode(),"custCode",packBean);
boolean flg = baseRDao.isExitByHql(packBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户零件转化明细客户零件号【%s】零件号【%s】特征值【%s】已经存在，请检查数据",
item.getCustPartNo(),item.getPartNo(), item.getMessageNo())
.build();
}
}
}

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

@ -1,10 +1,15 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartTransferService;
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;
import cn.estsh.i3plus.pojo.mes.bean.MesErpWorkCenter;
import cn.estsh.i3plus.pojo.mes.bean.MesPartTransfer;
import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -12,8 +17,34 @@ import org.springframework.stereotype.Service;
@Slf4j
public class MesPartTransferService extends BaseMesService<MesPartTransfer> implements IMesPartTransferService {
@Override
protected void setPackQueryBean(MesPartTransfer bean, DdlPackBean packBean) {
DdlPreparedPack.getStringLikerPack(bean.getCustCode(), "custCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getMessageNo(), "messageNo", packBean);
}
@Override
protected void onInsertBean(MesPartTransfer item) {
// 数据校验
ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空");
ValidatorBean.checkNotNull(item.getCustCode(), "custCode不能为空" );
ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "custOrganizeCode不能为空" );
ValidatorBean.checkNotNull(item.getMessageNo(), "messageNo不能为空");
//唯一性校验
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", packBean);
DdlPreparedPack.getStringEqualPack(item.getCustOrganizeCode(), "custOrganizeCode", packBean);
DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", packBean);
boolean flg = baseRDao.isExitByHql(packBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户零件转化配置客户代码【%s】信息点代码【%s】已经存在，请检查数据",
item.getCustCode(),item.getMessageNo() )
.build();
}
}
}

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

@ -62,19 +62,19 @@ public class MesProdShiftRecordServiceImpl extends BaseMesService<MesProdShiftRe
ValidatorBean.checkNotNull(item.getShiftCode(), "shiftCode不能为空");
//唯一性校验
// DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
// DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean);
// DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean);
// DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean);
//
// boolean flg = baseRDao.isExitByHql(packBean);
// if (flg) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("开关班记录产线【%s】班组代码【%s】班次代码【%s】已经存在，请检查数据",
// item.getWorkCenterCode(),item.getShiftGroup(),item.getShiftCode())
// .build();
// }
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean);
DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean);
boolean flg = baseRDao.isExitByHql(packBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("开关班记录产线【%s】班组代码【%s】班次代码【%s】已经存在，请检查数据",
item.getWorkCenterCode(),item.getShiftGroup(),item.getShiftCode())
.build();
}
}
}

Write Preview
Loading…
Cancel
Save