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
administrator 11 months ago
parent 7baf424ccf 7f078c176d
commit 94b3bd2199
6 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMoveRuleService.java
Unescape Escape View File

@ -13,5 +13,5 @@ import java.util.List;
**/
public interface IMesMoveRuleService extends IBaseMesService<MesMoveRule> {
List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String partProdGroupCode,String organizeCode);
List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code,String organizeCode);
}

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

@ -25,7 +25,7 @@ public class MesMoveRuleImpl extends BaseMesService<MesMoveRule> implements IMes
@Override
protected void setPackQueryBean(MesMoveRule bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCode(), "code", packBean);
DdlPreparedPack.getStringEqualPack(bean.getSrcType(), "srcType", packBean);
}
@ -35,11 +35,11 @@ public class MesMoveRuleImpl extends BaseMesService<MesMoveRule> implements IMes
checkNotNull(item);
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean);
DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean);
DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean);
if (baseRDao.isExitByHql(ddlPackBean)) {
MesException.throwMesBusiException("零件生产组代码【%s】来源类型【%s】数据已存在", item.getPartProdGroupCode(), item.getSrcType());
MesException.throwMesBusiException("代码【%s】来源类型【%s】数据已存在", item.getCode(), item.getSrcType());
}
}
@ -50,28 +50,28 @@ public class MesMoveRuleImpl extends BaseMesService<MesMoveRule> implements IMes
checkNotNull(item);
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean);
DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean);
DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean);
if (baseRDao.isExitByHql(ddlPackBean)) {
MesException.throwMesBusiException("零件生产组代码【%s】来源类型【%s】数据已存在", item.getPartProdGroupCode(), item.getSrcType());
MesException.throwMesBusiException("代码【%s】来源类型【%s】数据已存在", item.getCode(), item.getSrcType());
}
}
@Override
public List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String partProdGroupCode, String organizeCode) {
public List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code, String organizeCode) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(partProdGroupCode, "partProdGroupCode", ddlPackBean);
DdlPreparedPack.getStringEqualPack(code, "code", ddlPackBean);
List<MesMoveRule> moveRules = baseRDao.findByHqlWhere(ddlPackBean);
if (CollectionUtils.isEmpty(moveRules)) {
MesException.throwMesBusiException("零件生产组代码【%s】移库规则数据不存在", partProdGroupCode);
MesException.throwMesBusiException("代码【%s】移库规则数据不存在", code);
}
return moveRules;
}
private void checkNotNull(MesMoveRule item) {
ValidatorBean.checkNotNull(item.getPartProdGroupCode(), "零件生产组代码不能为空");
ValidatorBean.checkNotNull(item.getCode(), "代码不能为空");
ValidatorBean.checkNotNull(item.getErpSrcLocateNo(), "ERP来源库位不能为空");
ValidatorBean.checkNotNull(item.getErpDestLocateNo(), "ERP目的库位不能为空");
ValidatorBean.checkNotNull(item.getSrcType(), "来源类型不能为空");

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

@ -53,5 +53,30 @@ public class MesPartTransferDetailService extends BaseMesService<MesPartTransfer
.build();
}
}
@Override
protected void onUpdateBean(MesPartTransferDetail item) {
// 数据校验
ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "partNo不能为空");
ValidatorBean.checkNotNull(item.getCustPartNo(), "custPartNo不能为空" );
ValidatorBean.checkNotNull(item.getFeatureNo(), "featureNo不能为空");
//唯一性校验
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.getNumNOEqualPack(item.getId(), "id", 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();
}
}
}

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

@ -6,6 +6,7 @@ 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.MesPartShippingGroup;
import cn.estsh.i3plus.pojo.mes.bean.MesPartTransfer;
import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -47,4 +48,28 @@ public class MesPartTransferService extends BaseMesService<MesPartTransfer> impl
.build();
}
}
@Override
protected void onUpdateBean(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);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", 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();
}
}
}

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

@ -66,29 +66,8 @@ public class MesProdRuleNosortCfgService extends BaseMesService<MesProdRuleNosor
}
protected void onUpdateBean(MesProdRuleNosortCfg item) {
// 数据校验
ValidatorBean.checkNotNull(item.getOutPartNo(), "产成零件号不能为空");
ValidatorBean.checkNotNull(item.getOutPartNo(), "设备不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
if (StringUtils.isEmpty(item.getInPartNo())) {
DdlPreparedPack.getStringEqualPack(item.getInPartNo(), "inPartNo", seriesPackBean);
}
DdlPreparedPack.getStringEqualPack(item.getOutPartNo(), "outPartNo", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
boolean flg = baseRDao.isExitByHql(seriesPackBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("该非排序加工规则已存在，请检查数据")
.build();
}
}
@Override
public MesProdRuleNosortCfg findMesProdRuleNosortCfgByWorkCenterCode(String workCenterCode, String partNo, String organizeCode) {
List<MesProdRuleNosortCfg> prodRuleNosortCfgList = mesProdRuleNosortCfgDao.findMesProdRuleNosortCfgByWorkCenterCode(workCenterCode, partNo, organizeCode);

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

@ -59,26 +59,5 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
}
protected void onUpdateBean(MesProdRuleSortCfg item) {
// 数据校验
//ValidatorBean.checkNotNull(item.getInPartNo(), "进件零件号不能为空");
ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空");
ValidatorBean.checkNotNull(item.getAssemblyPartNo(), "零件号不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getAssemblyPartNo(), "assemblyPartNo", seriesPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
boolean flg = baseRDao.isExitByHql(seriesPackBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("该排序加工规则已存在，请检查数据")
.build();
}
}
}

Write Preview
Loading…
Cancel
Save