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 c91c49b94..d2079c848 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 @@ -334,16 +334,27 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } // 登记网点 - emisWaybillSave.setRegisterSiteCode(getCurrentUser().getOwnerSiteCode()); - emisWaybillSave.setRegisterManCode(getCurrentUser().getEmpCode()); - emisWaybillSave.setRegisterDate(new Date()); + if(isNew) { + emisWaybillSave.setRegisterSiteCode(getCurrentUser().getOwnerSiteCode()); + emisWaybillSave.setRegisterManCode(getCurrentUser().getEmpCode()); + emisWaybillSave.setRegisterDate(new Date()); + } + if(emisWaybillSave.getFeeWeight().floatValue()<=0.0f){ + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"运费必须大于0"); + } + + if(StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())){ + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"寄件网点必填"); + } // 发件网点 if(StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"寄件网点必填"); } + + // 目的网点 if(StringUtils.isEmpty(emisWaybillSave.getDispatchUnderlingSiteCode())){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"目的网点必填");