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-09-27 20:43:46 +08:00
parent 8fb891d99e
commit 4cca35d6ca
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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