diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java index 20d8674..5cfdefa 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java @@ -23,11 +23,13 @@ import org.springframework.stereotype.Service; @Slf4j public class MesBasDowntimeReasonServiceImpl extends BaseMesService implements IMesBasDowntimeReasonService { + @Override protected void setPackQueryBean(MesDowntimeReason bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getReasonCode(), "reasonCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getReasonName(), "reasonName", packBean); DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean); } + @Override protected void onInsertBean(MesDowntimeReason item) { // 数据校验 ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java index 701c2f9..43206c3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java @@ -23,10 +23,12 @@ import org.springframework.stereotype.Service; @Slf4j public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService implements IMesBasDowntimeReasonTypeService { + @Override protected void setPackQueryBean(MesDowntimeReasonType bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getReasonTypeName(), "reasonTypeName", packBean); } + @Override protected void onInsertBean(MesDowntimeReasonType item) { // 数据校验 ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumDetailServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumDetailServiceImpl.java index b842f69..cfcff69 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumDetailServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumDetailServiceImpl.java @@ -24,12 +24,14 @@ import org.springframework.stereotype.Service; @Slf4j public class MesEnumDetailServiceImpl extends BaseMesService implements IMesEnumDetailService { + @Override protected void setPackQueryBean(MesEnumDetail bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getEnumCode(), "enumCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getDetailCode(), "detailCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getDetailName(), "detailName", packBean); DdlPreparedPack.getStringEqualPack(bean.getDetailValue(), "detailValue", packBean); } + @Override protected void onInsertBean(MesEnumDetail item) { // 数据校验 ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumExtService.java index 42a28b1..395146a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumExtService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEnumExtService.java @@ -41,10 +41,12 @@ public class MesEnumExtService extends BaseMesService implements IMesEn private MesEnumRepository enumRepository; + @Override protected void setPackQueryBean(MesEnum bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getEnumCode(), "enumCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getEnumName(), "enumName", packBean); } + @Override protected void onInsertBean(MesEnum item) { // 数据校验 ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java index 946a692..795b601 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; @Slf4j public class MesLoadingGroupDetailServiceImpl extends BaseMesService implements IMesLoadingGroupDetailService { + @Override protected void setPackQueryBean(MesLoadingGroupDetail bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java index 088309a..1c50365 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; @Slf4j public class MesLoadingGroupServiceImpl extends BaseMesService implements IMesLoadingGroupService { + @Override protected void setPackQueryBean(MesLoadingGroup bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getLoadingGroupNo(), "loadingGroupNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getLoadingGroupName(), "loadingGroupName", packBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java index 0f56b23..a4bfffa 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; @Slf4j public class MesMaximoAssetMainDataServiceImpl extends BaseMesService implements IMesMaximoAssetMainDataService { + @Override protected void setPackQueryBean(MesMaximoAssetMainData bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean); // DdlPreparedPack.getNumEqualPack(bean.getDescription(), "description", packBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java index 9b7d536..f60485a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; @Slf4j public class MesMaximoMeterMainDataServiceImpl extends BaseMesService implements IMesMaximoMeterMainDataService { + @Override protected void setPackQueryBean(MesMaximoMeterMainData bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean); DdlPreparedPack.getStringEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java index 92a48b7..66402be 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java @@ -35,6 +35,8 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService