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

Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

Browse Source
tags/yfai-mes-ext-v1.0
微笑着面对明天 12 months ago
parent 3a5ee5a221 39db1c5201
commit cfc3af073f
6 changed files with 17 additions and 11 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/MesPartTransferController.java
Unescape Escape View File

@ -7,7 +7,7 @@ import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api("客户车型配置明细")
@Api("客户零件转化配置")
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartTransfer")
public class MesPartTransferController extends BaseMesController<MesPartTransfer> {

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

@ -43,16 +43,16 @@ public class MesEnumDetailServiceImpl extends BaseMesService<MesEnumDetail> impl
//唯一性校验
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getEnumCode(), "assetNum", packBean);
DdlPreparedPack.getStringEqualPack(item.getDetailCode(), "mouldNo", packBean);
DdlPreparedPack.getStringEqualPack(item.getDetailValue(), "equipmentCode", packBean);
DdlPreparedPack.getStringEqualPack(item.getEnumCode(), "enumCode", packBean);
DdlPreparedPack.getStringEqualPack(item.getDetailCode(), "detailCode", packBean);
DdlPreparedPack.getStringEqualPack(item.getDetailValue(), "detailValue", 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.getEnumCode(),item.getEnumCode(),item.getDetailValue())
.setErrorDetail("枚举代码【%s】属性代码【%s】属性值【%s】已经存在，请检查数据", item.getEnumCode(),item.getDetailCode(),item.getDetailValue())
.build();
}
}

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

@ -55,7 +55,7 @@ public class MesEnumExtService extends BaseMesService<MesEnum> implements IMesEn
//唯一性校验
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getEnumCode(), "assetNum", packBean);
DdlPreparedPack.getStringEqualPack(item.getEnumCode(), "enumCode", packBean);
boolean flg = baseRDao.isExitByHql(packBean);
if (flg) {

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

@ -18,7 +18,8 @@ public class MesItemPartErrorPreventionService extends BaseMesService<MesItemPar
protected void onInsertBean(MesItemPartErrorPrevention item) {
// 数据校验
ValidatorBean.checkNotNull(item.getBarrelBarcode(), "料桶条码不能为空");
ValidatorBean.checkNotNull(item.getPreventionObjectCode(), "防错对象代码不能为空");
ValidatorBean.checkNotNull(item.getPreventionCode(), "防错代码不能为空");
DdlPackBean errorPrePackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getBarrelBarcode(), "barrelBarcode", errorPrePackBean);
@ -36,7 +37,8 @@ public class MesItemPartErrorPreventionService extends BaseMesService<MesItemPar
protected void onUpdateBean(MesItemPartErrorPrevention item) {
// 数据校验
ValidatorBean.checkNotNull(item.getBarrelBarcode(), "料桶条码不能为空");
ValidatorBean.checkNotNull(item.getPreventionObjectCode(), "防错对象代码不能为空");
ValidatorBean.checkNotNull(item.getPreventionCode(), "防错代码不能为空");
DdlPackBean errorPrePackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getBarrelBarcode(), "barrelBarcode", errorPrePackBean);
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", errorPrePackBean);

3
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java
Unescape Escape View File

@ -56,6 +56,7 @@ public class MaximoServiceImpl implements IMaximoService {
maximoMeterMainData.setMeterName(paramModel.getMeterName());
maximoMeterMainData.setAssetNum(paramModel.getAssetNum());
maximoMeterMainData.setBaseMeasureUnitId(paramModel.getBaseMeasureUnitId());
maximoMeterMainData.setDescription(paramModel.getDescription());
ConvertBean.serviceModelInitialize(maximoMeterMainData, "doMeterMainData");
maximoMeterMainDataRDao.save(maximoMeterMainData);
@ -102,7 +103,7 @@ public class MaximoServiceImpl implements IMaximoService {
MesMaximoAssetMainData maximoAssetMainData = new MesMaximoAssetMainData();
maximoAssetMainData.setOrganizeCode(paramModel.getSiteId());
maximoAssetMainData.setAssetNum(paramModel.getAssetNum());
// maximoAssetMainData.setDescription(paramModel.getDescription());
maximoAssetMainData.setDescription(paramModel.getDescription());
maximoAssetMainData.setStatus(paramModel.getStatus());
maximoAssetMainData.setFailureCode(paramModel.getFailureCode());
ConvertBean.serviceModelInitialize(maximoAssetMainData, "doMeterMainData");

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java
Unescape Escape View File

@ -2,14 +2,17 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderPartService;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@Slf4j
public class MesSpotCheckOrderPartService extends BaseMesService<MesSpotCheckOrderPart> implements IMesSpotCheckOrderPartService {
protected void setPackQueryBean(MesSpotCheckOrderPart bean, DdlPackBean packBean) {
DdlPreparedPack.getNumEqualPack(bean.getSpotCheckOrderId(), "spotCheckOrderId", packBean);
}
}

Write Preview
Loading…
Cancel
Save