aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-15 19:47:20 +08:00
parent e9879295f2
commit 6c1378c1ef
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -797,14 +797,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
if(emisWaybillSave.getFreight().floatValue()<=0.0f){ 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( 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( if(StringUtils.isAnyEmpty(
@ -823,7 +822,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"计费方式必填"); // throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"计费方式必填");
// } // }
// 发件网点 // 发件网点
if(StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())){ if(StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())){
// throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"寄件网点必填"); // throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"寄件网点必填");
@ -1509,7 +1507,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillMapper.insertEmisWaybill(emisWaybillSave); emisWaybillMapper.insertEmisWaybill(emisWaybillSave);
// 扣减子单 // 扣减子单
emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty()); // emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty());
// 产生主键插入其他数据 // 产生主键插入其他数据
// 插入费用 // 插入费用