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-chongqingdaqu-prod
王杰 2 months ago
parent 615f2b276b 690d072318
commit 002ea6bf2d
6 changed files with 201 additions and 0 deletions
Show Stats Download Patch File Download Diff File

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

@ -0,0 +1,7 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType;
public interface IMesPackingPartTypeService extends IBaseMesService<MesPackingPartType> {
}

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

@ -0,0 +1,13 @@
package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api("成品包装类型零件信息")
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPackingPartType")
public class MesPackingPartTypeController extends BaseMesController<MesPackingPartType>{
}

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

@ -0,0 +1,71 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPackingPartTypeService;
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;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType;
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;
import java.util.List;
@Service
@Slf4j
public class MesPackingPartTypeService extends BaseMesService<MesPackingPartType> implements IMesPackingPartTypeService {
@Override
protected void setPackQueryBean(MesPackingPartType bean, DdlPackBean packBean) {
DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean);
DdlPreparedPack.getStringLikerPack(bean.getPartName(), MesExtConstWords.PART_NAME, packBean);
}
@Override
protected void onInsertBean(MesPackingPartType item) {
ValidatorBean.checkNotNull(item.getPartNo(), "零件代码不能为空");
ValidatorBean.checkNotNull(item.getPartName(), "零件名称不能为空");
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPartNo(), MesExtConstWords.PART_NO, packBean);
Boolean flg = baseRDao.isExitByHql(packBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("零件代码[%s]信息已经存在，请检查数据", item.getPartNo())
.build();
}
}
@Override
protected void onUpdateBean(MesPackingPartType item) {
ValidatorBean.checkNotNull(item.getId(), "包装代码不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "零件代码不能为空");
ValidatorBean.checkNotNull(item.getPartName(), "零件名称不能为空");
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPartNo(), MesExtConstWords.PART_NO, packBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), MesExtConstWords.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]信息已经存在，请检查数据", item.getPartNo())
.build();
}
}
@Override
public List<MesPackingPartType> validateReturnImport(List<MesPackingPartType> beanList) {
for (MesPackingPartType item : beanList) {
onInsertBean(item);
}
return beanList;
}
}

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

@ -2,12 +2,19 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleDetailService;
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;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesPackingRuleDetail;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
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;
import java.util.List;
@Service
@Slf4j
public class MesPackingRuleDetailService extends BaseMesService<MesPackingRuleDetail> implements IMesPackingRuleDetailService {
@ -19,4 +26,52 @@ public class MesPackingRuleDetailService extends BaseMesService<MesPackingRuleDe
DdlPreparedPack.getStringEqualPack(bean.getPartType(), MesExtConstWords.PART_TYPE, packBean);
}
@Override
protected void onInsertBean(MesPackingRuleDetail item) {
ValidatorBean.checkNotNull(item.getPackageCode(), "包装代码不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "物料号不能为空");
ValidatorBean.checkNotNull(item.getPartType(), "零件类型不能为空");
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean);
DdlPreparedPack.getStringEqualPack(item.getPartType(), MesExtConstWords.PART_TYPE, 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.getPackageCode(), MesExtEnumUtil.PACKING_RULE_DETAIL_PART_TYPE.valueOfDescription(item.getPartType()))
.build();
}
}
@Override
protected void onUpdateBean(MesPackingRuleDetail item) {
ValidatorBean.checkNotNull(item.getId(), "包装代码不能为空");
ValidatorBean.checkNotNull(item.getPackageCode(), "包装代码不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "物料号不能为空");
ValidatorBean.checkNotNull(item.getPartType(), "零件类型不能为空");
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean);
DdlPreparedPack.getStringEqualPack(item.getPartType(), MesExtConstWords.PART_TYPE, packBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), MesExtConstWords.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.getPackageCode(), MesExtEnumUtil.PACKING_RULE_DETAIL_PART_TYPE.valueOfDescription(item.getPartType()))
.build();
}
}
@Override
public List<MesPackingRuleDetail> validateReturnImport(List<MesPackingRuleDetail> beanList) {
for (MesPackingRuleDetail item : beanList) {
onInsertBean(item);
}
return beanList;
}
}

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

@ -2,11 +2,18 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleService;
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;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesPackingRule;
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;
import org.springframework.util.StringUtils;
import java.util.List;
@Service
@Slf4j
@ -23,4 +30,50 @@ public class MesPackingRuleService extends BaseMesService<MesPackingRule> implem
DdlPreparedPack.getStringLikerPack(bean.getPrinter(), MesExtConstWords.PRINTER, packBean);
}
@Override
protected void onInsertBean(MesPackingRule item) {
ValidatorBean.checkNotNull(item.getPackageCode(), "包装代码不能为空");
ValidatorBean.checkNotNull(item.getGenerateType(), "统计方式不能为空");
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean);
Boolean flg = baseRDao.isExitByHql(packBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("包装代码[%s]信息已经存在，请检查数据", item.getPackageCode())
.build();
}
if (StringUtils.isEmpty(item.getDefaultFlag()) || item.getDefaultFlag().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0) item.setDefaultFlag(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
}
@Override
protected void onUpdateBean(MesPackingRule item) {
ValidatorBean.checkNotNull(item.getId(), "包装代码不能为空");
ValidatorBean.checkNotNull(item.getPackageCode(), "包装代码不能为空");
ValidatorBean.checkNotNull(item.getGenerateType(), "统计方式不能为空");
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), MesExtConstWords.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]信息已经存在，请检查数据", item.getPackageCode())
.build();
}
if (StringUtils.isEmpty(item.getDefaultFlag()) || item.getDefaultFlag().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0) item.setDefaultFlag(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
}
@Override
public List<MesPackingRule> validateReturnImport(List<MesPackingRule> beanList) {
for (MesPackingRule item : beanList) {
onInsertBean(item);
}
return beanList;
}
}

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

@ -246,6 +246,8 @@ public class MesExtConstWords {
public static final String PUSH_SOURCE_CODE = "pushSourceCode";
//推送工位类型
public static final String PUSH_TYPE = "pushType";
//零件类型名称
public static final String PART_TYPE_NAME = "partTypeName";
//时间[开始/结束]条件
public static final String START_TIME_START = "startTimeStart";

Write Preview
Loading…
Cancel
Save