From 6c1378c1ef78126e7e5ec70a07e96ede1506a9d4 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 15 Jul 2024 19:47:20 +0800 Subject: [PATCH] md --- .../emis/service/impl/EmisWaybillServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 5cf8122b9..7f13f0952 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 @@ -797,14 +797,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } if(emisWaybillSave.getFreight().floatValue()<=0.0f){ - throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"运费必须大于0"); +// throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"运费必须大于0"); } - +// emisWaybillSave.getTotalVolume().floatValue() <=0.0f if( - emisWaybillSave.getTotalVolume().floatValue() <=0.0f - || emisWaybillSave.getBillWeight().floatValue() <=0.0f + emisWaybillSave.getBillWeight().floatValue() <=0.0f ){ - throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"体积,实重必须大于0"); + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"重量必须大于0"); } if(StringUtils.isAnyEmpty( @@ -823,7 +822,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"计费方式必填"); // } - // 发件网点 if(StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())){ // throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"寄件网点必填"); @@ -1509,7 +1507,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillMapper.insertEmisWaybill(emisWaybillSave); // 扣减子单 - emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty()); +// emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty()); // 产生主键插入其他数据 // 插入费用