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-07-20 16:25:47 +08:00
parent 85fdf2894b
commit 5b063c81ea
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1076,6 +1076,16 @@ public class EmisBaseService {
emisSettleSubBill.setBillNo(dt.getBillCode());
emisSettleSubBill.setBillDate(new Date());
// 虚拟面单自动设置为系统不出账
if("1".equals(dt.getBlIsQuestion())){
if(dt.getProblemType() == 173 || dt.getProblemType() == 170){
emisSettleSubBill.setBlConfirmCenter("2");
emisSettleSubBill.setConfirmCenterNote("虚拟面单确认不出账");
emisSettleSubBill.setBlConfirmSite("2");
emisSettleSubBill.setConfirmSiteNote("虚拟面单确认不出账");
}
}
// 账单类型 1-现金 2-月结
if( StringUtils.equalsAny(dt.getPaymentType(),"2","4","5")) {
emisSettleSubBill.setSettleType("2");
@ -1089,6 +1099,8 @@ public class EmisBaseService {
emisSettleSubBill.setBillFee(dt.getFreight());
emisSettleSubBill.setCustNo(dt.getCustNo());
emisSettleSubBill.setCustName(dt.getCustName());
emisSettleSubBill.setCustomerCode(dt.getCustomerCode());
emisSettleSubBill.setCustomerName(dt.getCustomerName());
@ -1103,16 +1115,16 @@ public class EmisBaseService {
// 生成费用明细
if(dt.getCalcFeeType().equals("3")) {
EmisSettleSubBillFeeitem emisSettleSubBillFeeitem =new EmisSettleSubBillFeeitem();
emisSettleSubBillFeeitem.setSubBillNo(dt.getBillCode());
emisSettleSubBillFeeitem.setBillCode(dt.getBillCode());
emisSettleSubBillFeeitem.setBillFee(dt.getFreight());
emisSettleSubBillFeeitem.setCurrency(dt.getCurrency());
emisSettleSubBillFeeitem.setFeeCode("1001");
emisSettleSubBillFeeitem.setFeeName("运输费");
emisSettleSubBillFeeitem.setOrigFee(dt.getFreight());
emisSettleSubBillFeeitem.setRemark("一口价运输费");
emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem);
// EmisSettleSubBillFeeitem emisSettleSubBillFeeitem =new EmisSettleSubBillFeeitem();
// emisSettleSubBillFeeitem.setSubBillNo(dt.getBillCode());
// emisSettleSubBillFeeitem.setBillCode(dt.getBillCode());
// emisSettleSubBillFeeitem.setBillFee(dt.getFreight());
// emisSettleSubBillFeeitem.setCurrency(dt.getCurrency());
// emisSettleSubBillFeeitem.setFeeCode("1001");
// emisSettleSubBillFeeitem.setFeeName("运输费");
// emisSettleSubBillFeeitem.setOrigFee(dt.getFreight());
// emisSettleSubBillFeeitem.setRemark("一口价运输费");
// emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem);
}else{
List<EmisWaybillFeeitem> feeitemList = emisWaybillFeeitemMapper.selectFeeitemListByWaybillId(dt.getId());
@ -1124,7 +1136,7 @@ public class EmisBaseService {
emisSettleSubBillFeeitem.setCurrency(feeitem.getCurrency());
emisSettleSubBillFeeitem.setFeeCode(feeitem.getFeeCode());
emisSettleSubBillFeeitem.setFeeName(feeitem.getFeeName());
emisSettleSubBillFeeitem.setOrigFee(feeitem.getRealFee());
emisSettleSubBillFeeitem.setOrigFee(feeitem.getFee());
emisSettleSubBillFeeitem.setRemark(feeitem.getRemark());
emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem);
}
@ -1132,7 +1144,6 @@ public class EmisBaseService {
// 出账标识
emisWaybillMapper.updateHasDoBill(dt);
// 判断网点余额-运单金额 是否足够，如果不够则不允许下单
EmisSiteAccount emisSiteAccount=getSiteAccountBySiteCode(dt.getSendSiteCode());
if(emisSiteAccount!=null){