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 93a97b8cd..03db09627 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 @@ -1610,7 +1610,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } - if(emisWaybillSave.getBillWeight()==null || emisWaybillSave.getBillWeight().floatValue()<=0.0f){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"实重必须大于0"); } @@ -1873,14 +1872,22 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户不存在"); } emisWaybillSave.setCustName(emisMonthCustomerUser.getCustName()); -// emisWaybillSave.setPayee(emisMonthCustomerUser.getPayee()); -// emisWaybillSave.setSalesmen(emisMonthCustomerUser.getSalesmen()); + if(isNew) { + emisWaybillSave.setPayee(emisMonthCustomerUser.getPayee()); + emisWaybillSave.setSalesmen(emisMonthCustomerUser.getSalesmen()); + } }else{ // 现金模式需要清空月结账户编号 emisWaybillSave.setCustNo(" "); emisWaybillSave.setCustName(" "); } + if(isNew) { + if(StringUtils.isEmpty(emisWaybillSave.getPayee()) || StringUtils.isEmpty(emisWaybillSave.getSalesmen()) ){ + throw new EmisBizError(EmisBizErrorType.FAIL,"销售联系人和回款联系人必填"); + } + } + // 保存客户收件、寄件地址,开单不要关联客户地址数据 sendAddress.setCustomerCode(customerCode); recieveAddress.setCustomerCode(customerCode);