From 2b4f83ca0bc87fd13bdde02d1294a5f21d45fc43 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 2 Jul 2024 17:32:45 +0800 Subject: [PATCH] md --- .../erp/emis/mapper/EmisCustomerUserMapper.java | 2 +- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java index 2a81d40a0..4f5e2bb16 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java @@ -80,7 +80,7 @@ public interface EmisCustomerUserMapper extends BaseMapper public EmisCustomerUser selectEmisCustomerUserByPhone(String phone); - public EmisCustomerUser selectMonthCustomerByName(String name); + public EmisCustomerUser selectMonthCustomerByName(String customerName); public EmisCustomerUser selectMonthCustomerByMonthlyPayCode(String monthlyPayCode); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 66e99ed02..b08085f6a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -277,6 +277,17 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "产品名称不能为空"); } + // 运费必填 + if(emisWaybillSave.getFreight() == null || ( + emisWaybillSave.getFreight()!=null && emisWaybillSave.getFreight().compareTo(BigDecimal.ZERO)==0 ) ){ + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "运费必须大于0"); + } + + // 货值必填 + if(StringUtils.isEmpty(emisWaybillSave.getRealValue()) ){ + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "货值必填"); + } + // 线路转换 EmisTransLine transLine=getTransLineByName(emisWaybillSave.getTransLineType()); if(transLine==null){