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 8f9c21e6f..20917c5b5 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 @@ -340,6 +340,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setRegisterDate(new Date()); } + + if(emisWaybillSave.getFreight().floatValue()<=0.0f){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"运费必须大于0"); } @@ -367,15 +369,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } - if(StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())){ - throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"寄件网点必填"); - } - // 发件网点 if(StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"寄件网点必填"); } + // 寄件网点财务中心 + EmisSite sendSite = getSiteByCode(emisWaybillSave.getSendSiteCode()); + emisWaybillSave.setSendCenterCode(sendSite.getParentSiteCode()); + if(StringUtils.isEmpty(emisWaybillSave.getPackType())){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"包装类型必填"); } @@ -396,6 +398,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if(destSite!=null){ destSite3Code=destSite.getSizeCode2(); } + // 目的网点财务中心 + emisWaybillSave.setDestinationCenterCode(destSite.getParentSiteCode()); + // 目的地名称 EmisDestination destination=getDestinationByCode(emisWaybillSave.getDestinationCode()); String destName="";