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

Write Preview
Loading…
Cancel
Save