From f7bb788ec08c52ed6a933dc01d51bbaa48d59b47 Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 30 May 2024 17:48:26 +0800 Subject: [PATCH] =?UTF-8?q?MesCustomerPart=E4=BF=AE=E6=94=B9pojo=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/MesCustomerPartService.java | 14 +++++++------- .../apiservice/serviceimpl/base/MesWorkOrderService.java | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java index 9520933..27c9bf2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java @@ -34,29 +34,29 @@ public class MesCustomerPartService extends BaseMesService impl private MesCustomerCarModelDetailRepository mesCustomerCarModelDetailRDao; protected void setPackQueryBean(MesCustomerPart bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "customerPartNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getErpPartNo(), "erpPartNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getErpPartName(), "erpPartName", packBean); - DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getCustCode(), "customerCode", packBean); } protected void onInsertBean(MesCustomerPart item) { // 数据校验 - ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空"); ValidatorBean.checkNotNull(item.getErpPartNo(), "零件号不能为空"); - ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空"); + ValidatorBean.checkNotNull(item.getCustPartNo(), "客户零件号不能为空"); DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getErpPartNo(), "erpPartNo", cellBinPackBean); - DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustPartNo(), "customerPartNo", cellBinPackBean); boolean flg = baseRDao.isExitByHql(cellBinPackBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getErpPartNo(), item.getCustomerCode()) + .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustPartNo(), item.getErpPartNo(), item.getCustCode()) .build(); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index d513a8f..c2919ea 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -394,8 +394,8 @@ public class MesWorkOrderService extends BaseMesService implements DdlPreparedPack.getStringEqualPack(item.getPartNo(), "erpPartNo", ddlPackBean); MesCustomerPart customerPart = mesCustomerPartRDao.getByProperty(ddlPackBean); if(!Objects.isNull(customerPart)){ - item.setCustomerPartNo(customerPart.getCustomerPartNo()); - item.setCustomerPartName(customerPart.getCustomerPartName()); + item.setCustomerPartNo(customerPart.getCustPartNo()); + item.setCustomerPartName(customerPart.getCustPartName()); } }