From cbf3b99c73060b1b4e682abce4330ea6d9d6ecf6 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 21 Jan 2025 13:20:41 +0800 Subject: [PATCH] md --- .../domain/enumtype/WaybillOperLogType.java | 3 + .../erp/emis/service/EmisBaseService.java | 10 ++++ .../impl/EmisSettleBillServiceImpl.java | 55 +++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java index bc13c94d1..e65bd384f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java @@ -20,6 +20,9 @@ public enum WaybillOperLogType { SITE_CANCEL_ORDER("81","站点取消"), SITE_MODIFY_APPLY("82","网点申请调整费用"), SITE_DO_SCAN("83","网点扫描"), + SITE_MERGE_BILL("84","账单定制"), + SITE_OPEN_BILL_STATUS_CHANGE("85","开票状态变更"), + SITE_PAYMENT_STATUS_CHANGE("85","收款状态变更"), CUST_MODIFY_ORDER("91","客户改单"), CUST_CANCEL_ORDER("92","客户取消"), diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 2cc856799..bdad41dbc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1331,6 +1331,16 @@ public class EmisBaseService { // 出账标识 emisWaybillMapper.updateHasDoBill(dt); + // 账单定制 + recordWaybillOperLog( + dt.getBillCode(), + WaybillOperLogType.SITE_MERGE_BILL, + null, + null, + "运单出账-系统自动" + ); + + // String title="运单已出账，请尽快确认【"+dt.getBillCode()+"】"; // sendNoticeToSalemenUser(dt.getSalesmen(), title, "", "d24/orderManagement/UserOrderList"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 92d50d608..e899e165c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -19,6 +19,7 @@ import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.StringUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; +import com.xdadan.erp.emis.domain.enumtype.WaybillOperLogType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.BillPayStatInfo; import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo; @@ -331,6 +332,16 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS subBllOld.setSettleBillNo(emisSettleBill.getSettleBillNo()); emisSettleSubBillMapper.addToSettleBill(subBllOld); + // 账单定制 + recordWaybillOperLog( + billNo, + WaybillOperLogType.SITE_MERGE_BILL, + getCurrentUser().getEmpName(), + getCurrentUser().getOwnerSiteName(), + "定制账单-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]" + ); + + } // 总账单重算 @@ -378,6 +389,15 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS // 子账单移除 subBllOld.setSettleBillNo(emisSettleBill.getSettleBillNo()); emisSettleSubBillMapper.removeFromMainSettleBill(subBllOld); + + // 账单定制 + recordWaybillOperLog( + billNo, + WaybillOperLogType.SITE_MERGE_BILL, + getCurrentUser().getEmpName(), + getCurrentUser().getOwnerSiteName(), + "从定制账单移除-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]" + ); } // 总账单重算 @@ -521,24 +541,42 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS updEmisSettleSubBill.setBillCode(subBill.getBillCode()); updEmisSettleSubBill.setInvoicedMoney(sumMoney); + String openBillStatusDesc=""; if(!"3".equals(subBill.getOpenBillStatus())&&!"4".equals(subBill.getOpenBillStatus())) { if (sumMoney.compareTo(BigDecimal.ZERO) == 0) { + openBillStatusDesc="未开票"; updEmisSettleSubBill.setOpenBillStatus("0"); } else { if (sumMoney.compareTo(subBill.getBillFee()) >= 0) { + + openBillStatusDesc="已开票"; updEmisSettleSubBill.setOpenBillStatus("1"); } else { + + openBillStatusDesc="部分开票"; updEmisSettleSubBill.setOpenBillStatus("2"); } } // 更新每一单的开票状态 emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill); + + }else{ // 如果开票金额大于等于账单金额 if (sumMoney.compareTo(subBill.getBillFee()) >= 0) { + openBillStatusDesc="已开票"; updEmisSettleSubBill.setOpenBillStatus("1"); } } + + // 开票状态改变 + recordWaybillOperLog( + subBill.getBillCode(), + WaybillOperLogType.SITE_OPEN_BILL_STATUS_CHANGE, + null, + null, + "开票状态变更["+openBillStatusDesc+"]" + ); } log.info("==>reCalcSettleBillInvoiceStatus:totalMoney={},recMoney={},recMoney-totalMoney:{}",totalMoney,oldBill.getRecMoney()); @@ -716,6 +754,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS if(StringUtils.isEmpty(billNo)){ continue; } + + EmisSettleSubBill subBill = emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(billNo); BigDecimal sumMoney = BigDecimal.valueOf(Double.valueOf(item.get("sumMoney").toString())); totalMoney = totalMoney.add(sumMoney); @@ -723,12 +763,17 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setBillCode(subBill.getBillCode()); + String paymentStatusDesc=""; + if( sumMoney.compareTo(BigDecimal.ZERO) == 0 ){ emisWaybill.setPaymentStatus("0"); + paymentStatusDesc="未付款"; }else{ if (sumMoney.compareTo(subBill.getBillFee()) >= 0) { + paymentStatusDesc="已付款"; emisWaybill.setPaymentStatus("1"); } else { + paymentStatusDesc="部分付款"; emisWaybill.setPaymentStatus("2"); } } @@ -740,6 +785,16 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS updEmisSettleSubBill.setRecedMoney(sumMoney); updEmisSettleSubBill.setBillCode(subBill.getBillCode()); emisSettleSubBillMapper.updatePayedStatus(updEmisSettleSubBill); + + // 收款状态改变 + recordWaybillOperLog( + subBill.getBillCode(), + WaybillOperLogType.SITE_PAYMENT_STATUS_CHANGE, + null, + null, + "收款状态变更["+paymentStatusDesc+"]" + ); + } } }