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-08-25 07:30:15 +08:00
parent e63bfaec4f
commit 34c0b826ad
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1130,12 +1130,7 @@ public class EmisBaseService {
}
}
// 账单类型 1-现金 2-月结
if( StringUtils.equalsAny(dt.getPaymentType(),"2","4","5")) {
emisSettleSubBill.setSettleType("2");
}else{
emisSettleSubBill.setSettleType("1");
}
emisSettleSubBill.setCurrency(dt.getCurrency());
emisSettleSubBill.setBillMonth(DateUtils.parseDateToStr("yyyyMM",dt.getSendDate()));
@ -1152,6 +1147,17 @@ public class EmisBaseService {
emisSettleSubBill.setSalesmen(dt.getSalesmen());
emisSettleSubBill.setBlSpecialQuote(dt.getBlSpecialQuote());
// 账单类型 1-现金 2-月结
if( StringUtils.equalsAny(dt.getPaymentType(),"2","4","5")) {
emisSettleSubBill.setSettleType("2");
}else{
// 现金模式需要清空月结客户
emisSettleSubBill.setCustName(" ");
emisSettleSubBill.setCustNo(" ");
emisSettleSubBill.setSettleType("1");
}
// 新费用
newTotalFee = emisSettleSubBill.getBillFee();

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

@ -1812,6 +1812,26 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
// 仓库收货
if("1".equals(emisWaybillSave.getPickupMethod())){
if(StringUtils.isEmpty(emisWaybillSave.getOperateEmployeeCode())){
throw new EmisBizError(EmisBizErrorType.FAIL,"操作员不能为空");
}else{
// 清空取件员
emisWaybillSave.setTakePieceEmployeeCode(" ");
}
}
else if("2".equals(emisWaybillSave.getPickupMethod())){
if(StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode())){
throw new EmisBizError(EmisBizErrorType.FAIL,"取件员不能为空");
}else{
// 清空操作员
emisWaybillSave.setOperateEmployeeCode(" ");
}
}else{
emisWaybillSave.setOperateEmployeeCode(" ");
emisWaybillSave.setTakePieceEmployeeCode(" ");
}
// 月结客户直接根据月结编号获取客户编码和名称
if("2".equals(emisWaybillSave.getPaymentType())
@ -1826,6 +1846,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setCustName(emisMonthCustomerUser.getCustName());
emisWaybillSave.setPayee(emisMonthCustomerUser.getPayee());
emisWaybillSave.setSalesmen(emisMonthCustomerUser.getSalesmen());
}else{
// 现金模式需要清空月结账户编号
emisWaybillSave.setCustNo(" ");
emisWaybillSave.setCustName(" ");
}
// 保存客户收件、寄件地址，开单不要关联客户地址数据