From c8ef2c8044fb466ba45614c6d476216222b3e021 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 29 Nov 2024 10:25:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=20#bug=2044007=20=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=86=99=E5=85=A5=E5=88=B0mes=5Fjis=5Fshippi?= =?UTF-8?q?ng=E5=AD=97=E6=AE=B5=EF=BC=9A=E6=8C=89=E7=85=A7=E5=B9=BF?= =?UTF-8?q?=E5=B7=9E=E5=B7=A5=E5=8E=82=E8=A3=85=E8=BD=A6=E5=8D=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=86=99=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/api/busi/IMesConfigService.java | 9 ++++++--- .../serviceimpl/busi/MesConfigService.java | 21 +++++++++++---------- .../serviceimpl/busi/MesJisShippingServiceImpl.java | 9 ++++++--- .../ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 14 +++++++++++--- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesConfigService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesConfigService.java index 0dd8ca2..e79c9b5 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesConfigService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesConfigService.java @@ -12,11 +12,14 @@ import java.util.List; */ public interface IMesConfigService { - @ApiOperation(value = "获取配置表模板代码") + @ApiOperation(value = "获取系统参数") String getCfgValue(String org, String key); - @ApiOperation(value = "获取配置表模板代码") - MesConfig getMesConfig(String org, String key); + @ApiOperation(value = "获取系统参数") + MesConfig getMesConfig(String organizeCode, String key); + + @ApiOperation(value = "获取系统参数") + MesConfig getMesConfigNoError(String organizeCode, String cfgKey); @ApiOperation(value = "获取系统配置集合") List getConfigList(String organizeCode, String cfgCode, String cfgKey, String cfgType); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesConfigService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesConfigService.java index 5db45e6..3e73b20 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesConfigService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesConfigService.java @@ -37,30 +37,31 @@ public class MesConfigService implements IMesConfigService { new Object[]{key, org, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue()}); if (config == null) { - throw ImppExceptionBuilder.newInstance().setErrorCode(cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail(String.format("配置表数据不存在，请维护key【%s】", key)) - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .build(); + MesPcnException.throwMesBusiException("配置表数据不存在，请维护key【%s】", key); } return config.getCfgValue(); } @Override - public MesConfig getMesConfig(String org, String key) { + public MesConfig getMesConfig(String organizeCode, String key) { MesConfig config = configRepository.getByProperty( new String[]{"cfgKey", "organizeCode", "isValid", "isDeleted"}, - new Object[]{key, org, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue()}); + new Object[]{key, organizeCode, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue()}); if (config == null) { - throw ImppExceptionBuilder.newInstance().setErrorCode(cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail(String.format("配置表数据不存在，请维护key【%s】", key)) - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .build(); + MesPcnException.throwMesBusiException("配置表数据不存在，请维护key【%s】", key); } return config; } @Override + public MesConfig getMesConfigNoError(String organizeCode, String cfgKey) { + return configRepository.getByProperty( + new String[]{"cfgKey", "organizeCode", "isValid", "isDeleted"}, + new Object[]{cfgKey, organizeCode, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue()}); + } + + @Override public List getConfigList(String organizeCode, String cfgCode, String cfgKey, String cfgType) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(cfgCode, MesPcnExtConstWords.CFG_CODE, packBean); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingServiceImpl.java index 714dc07..dc024bc 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingServiceImpl.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesConfig; import cn.estsh.i3plus.pojo.mes.bean.MesJisShipping; import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement; @@ -19,6 +20,7 @@ import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.UUID; /** @@ -40,8 +42,9 @@ public class MesJisShippingServiceImpl implements IMesJisShippingService { public List getJisShipping(MesShippingOrderManagement orderManagement, List orderManagementDetailList,String userName) { MesPartShippingGroup mesPartShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(orderManagement.getOrganizeCode(), orderManagement.getShippingGroupCode()); - String warerhouse = mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(orderManagement.getOrganizeCode(), "ERP_WARERHOUSE") : mesPartShippingGroup.getSrcWarerhouse(); - String erpWarehous = configService.getCfgValue(orderManagement.getOrganizeCode(), "ERP_WAREHOUS"); + String warerhouse = mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(orderManagement.getOrganizeCode(), MesPcnExtConstWords.ERP_WARERHOUSE) : mesPartShippingGroup.getSrcWarerhouse(); + String erpWarehous = configService.getCfgValue(orderManagement.getOrganizeCode(), MesPcnExtConstWords.ERP_WAREHOUS); + MesConfig useCustOrderNo = configService.getMesConfigNoError(orderManagement.getOrganizeCode(), MesPcnExtConstWords.USE_CUST_ORDER_NO); List jisShippingList = new ArrayList<>(); orderManagementDetailList.forEach(k -> { MesJisShipping jisShipping = new MesJisShipping(); @@ -54,7 +57,7 @@ public class MesJisShippingServiceImpl implements IMesJisShippingService { jisShipping.setDock(orderManagement.getSendDockCode()); jisShipping.setCusCode(orderManagement.getCustCode()); jisShipping.setCusDock(orderManagement.getCustDockCode()); - jisShipping.setCustOrderNo(orderManagement.getOrderCode()); + jisShipping.setCustOrderNo(Objects.isNull(useCustOrderNo) || Integer.parseInt(useCustOrderNo.getCfgValue()) == CommonEnumUtil.FALSE ? orderManagement.getOrderCode() : k.getCustOrderNo()); // 20241115 没有给carNo赋值 jisShipping.setCarNo(k.getVin()); jisShipping.setSerialNumber(k.getBarcode()); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 11b704e..c3c9607 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -577,17 +577,25 @@ public class MesPcnExtConstWords { //打印客户条码 public static final String SORT_WORK_CENTER_PRINT = "SORT_WORK_CENTER_PRINT"; - //强过 + + //强过 跳过 public static final String SHIP_PASS = "跳过"; public static final String STRONGER_PASS = "强过"; + //发运库存地 + public static final String ERP_WAREHOUS = "ERP_WAREHOUS"; + public static final String ERP_WARERHOUSE = "ERP_WARERHOUSE"; + //发运解析条码最大长度 + public static final String MAX_SHIPPING_BARCODE_LENGTH = "MAX_SHIPPING_BARCODE_LENGTH"; + //使用客户订单号 + public static final String USE_CUST_ORDER_NO = "USE_CUST_ORDER_NO"; + + //SPS强过配置code public static final String SPS_STRONGER_PASS = "SPS_STRONGER_PASS"; // JIS跳过码 public static final String JIS_SKIP_CODE = "JIS_SKIP_CODE"; - //发运解析条码最大长度 - public static final String MAX_SHIPPING_BARCODE_LENGTH = "MAX_SHIPPING_BARCODE_LENGTH"; //裁片工单号 public static final String CUT_WORK_ORDER_NO = "cutWorkOrderNo"; // 条码