|
|
@ -2,13 +2,22 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.ext.mes.api.base.IMesPackingDefineDetailsService;
|
|
|
|
import cn.estsh.i3plus.ext.mes.api.base.IMesPackingDefineDetailsService;
|
|
|
|
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
|
|
|
|
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
|
|
|
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.base.tool.DdlPreparedPack;
|
|
|
|
import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineDetails;
|
|
|
|
import cn.estsh.i3plus.pojo.base.util.StringUtil;
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.bean.*;
|
|
|
|
|
|
|
|
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 cn.estsh.impp.framework.boot.util.ValidatorBean;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* @Description : 包装定义维护明细
|
|
|
|
* @Description : 包装定义维护明细
|
|
|
|
* @Reference :
|
|
|
|
* @Reference :
|
|
|
@ -20,6 +29,9 @@ import org.springframework.stereotype.Service;
|
|
|
|
@Slf4j
|
|
|
|
@Slf4j
|
|
|
|
public class MesPackingDefineDetailsServiceImpl extends BaseMesService<MesPackingDefineDetails> implements IMesPackingDefineDetailsService {
|
|
|
|
public class MesPackingDefineDetailsServiceImpl extends BaseMesService<MesPackingDefineDetails> implements IMesPackingDefineDetailsService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private MesPartRepository mesPartRepository;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
protected void setPackQueryBean(MesPackingDefineDetails bean, DdlPackBean packBean) {
|
|
|
|
protected void setPackQueryBean(MesPackingDefineDetails bean, DdlPackBean packBean) {
|
|
|
|
DdlPreparedPack.getStringEqualPack(bean.getPackCode(), "packCode", packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(bean.getPackCode(), "packCode", packBean);
|
|
|
@ -59,4 +71,35 @@ public class MesPackingDefineDetailsServiceImpl extends BaseMesService<MesPackin
|
|
|
|
MesException.throwMesBusiException("箱类别代号【%s】物料号【%s】已经存在,请检查数据", item.getPackCode(),item.getPartNo());
|
|
|
|
MesException.throwMesBusiException("箱类别代号【%s】物料号【%s】已经存在,请检查数据", item.getPackCode(),item.getPartNo());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public List<MesPackingDefineDetails> validateReturnImport(List<MesPackingDefineDetails> beanList) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (MesPackingDefineDetails item : beanList) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String organizeCode = AuthUtil.getOrganizeCode();
|
|
|
|
|
|
|
|
// 数据校验
|
|
|
|
|
|
|
|
ValidatorBean.checkNotNull(item.getPackCode(), "箱类别代号不能为空");
|
|
|
|
|
|
|
|
ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DdlPackBean partQueryPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(item.getPartNo(), "partNo", partQueryPackBean);
|
|
|
|
|
|
|
|
MesPart mesPart = mesPartRepository.getByProperty(partQueryPackBean);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (mesPart == null) {
|
|
|
|
|
|
|
|
MesException.throwMesBusiException("物料号【%s】不存在,请检查数据",item.getPartNo());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
item.setPartName(mesPart.getPartName());
|
|
|
|
|
|
|
|
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(item.getPackCode(), "packCode", roadPackBean);
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", roadPackBean);
|
|
|
|
|
|
|
|
boolean flg = baseRDao.isExitByHql(roadPackBean);
|
|
|
|
|
|
|
|
if (flg) {
|
|
|
|
|
|
|
|
MesException.throwMesBusiException("箱类别代号【%s】物料号【%s】已经存在,请检查数据", item.getPackCode(),item.getPartNo());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return beanList;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|