From b0ac2d9e937cdc7d9e2465b6e530b556d7a4b778 Mon Sep 17 00:00:00 2001 From: gsz Date: Tue, 21 May 2024 19:40:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=98=8E=E7=BB=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesEnumDetailServiceImpl.java | 8 ++++---- .../ext/mes/apiservice/serviceimpl/base/MesEnumExtService.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 cfcff69..e4e2e9f 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 @@ -43,16 +43,16 @@ public class MesEnumDetailServiceImpl extends BaseMesService 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(); } } 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 395146a..1698afd 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 @@ -55,7 +55,7 @@ public class MesEnumExtService extends BaseMesService 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) { From f361dd372aca1cce2bfb143c7c12090390e6d88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Wed, 22 May 2024 09:10:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesItemPartErrorPreventionService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesItemPartErrorPreventionService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesItemPartErrorPreventionService.java index 190f51e..2b2d726 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesItemPartErrorPreventionService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesItemPartErrorPreventionService.java @@ -18,7 +18,8 @@ public class MesItemPartErrorPreventionService extends BaseMesService Date: Wed, 22 May 2024 09:17:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/controller/base/MesPartTransferController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTransferController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTransferController.java index 76df2a3..2e2965b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTransferController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTransferController.java @@ -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 { From f32c1dcb034eaf6b2dbe0ce44e64fab7cce60789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Wed, 22 May 2024 09:18:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java index ad93890..8c9056d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java @@ -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 implements IMesSpotCheckOrderPartService { + protected void setPackQueryBean(MesSpotCheckOrderPart bean, DdlPackBean packBean) { + DdlPreparedPack.getNumEqualPack(bean.getSpotCheckOrderId(), "spotCheckOrderId", packBean); + } } From 39db1c52015807f35443cd89f1d07337f292260e Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 22 May 2024 13:12:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Maximo=20=E5=A2=9E=E5=8A=A0=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java index 902a0c7..ce15bbe 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java @@ -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");