diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index b587e4f07..3bbc2c72e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -416,7 +416,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply); String title="开票成功,请下载发票:开票账单号【"+oldApply.getSettleBillNo()+"】"; - sendNoticeToEmpUser(oldApply.getApplyManCode(), title, "", "d24/orderManagement/UserOrderList"); + sendNoticeToEmpUser(oldApply.getApplyManCode(), title, "", "/ruyERj/SiteInvoiceRecordApply"); // 触发开票状态更新 String [] settleBillNoArr=oldApply.getSettleBillNo().split(","); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java index 39a47301f..3712ac5b7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java @@ -15,6 +15,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import com.xdadan.erp.common.core.domain.entity.SysUser; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -185,8 +186,9 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen emisSettleBillService.reCalcSettleBillInvoiceStatus(billNo); } - String title="业务提交了开票申请,请及时开票!"; - sendNoticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083", title, "", "d24/orderManagement/UserOrderList"); + String empName=getCurrentUser().getEmpName(); + String title=empName+"提交了开票申请,开票抬头:"+emisSettleInvoiceRecord.getCompanyName()+",开票金额:"+emisSettleInvoiceRecord.getApplyMoney()+",请及时开票!"; + sendNoticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083", title, "", "/ruyERj/CenterInvoiceRecordDeal"); return 1; } @@ -257,7 +259,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen emisSettleInvoiceRecordMapper.auditCenterNoPass(emisSettleInvoiceRecord); String title="你提交的开票申请被驳回,账单号【"+emisSettleInvoiceRecord.getSettleBillNo()+"】"; - sendNoticeToEmpUser(emisSettleInvoiceRecord.getApplyManCode(), title, "", "d24/orderManagement/UserOrderList"); + sendNoticeToEmpUser(emisSettleInvoiceRecord.getApplyManCode(), title, "", "/ruyERj/SiteInvoiceRecordApply"); // 重新计算开票状态 String[] settleBillArr=emisSettleInvoiceRecord.getSettleBillNo().split(","); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index 4044d0def..a6937668a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -95,8 +95,10 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements { emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply); - String title="费用调整审核,请及时审批,单号【"+emisWaybillAjustApply.getBillCode()+"】"; - sendNoticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083", title, "", "d24/orderManagement/UserOrderList"); + SysUser sysUser=getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode()); + + String title=sysUser.getEmpName()+"提交了运单费用调整申请,请及时审批,单号【"+emisWaybillAjustApply.getBillCode()+"】"; + sendNoticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083", title, "", "/d24/expenseRecognitionManagemen/WaybillAjustCenterConfirm"); return 1; } @@ -240,7 +242,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave); String title="费用调整已审批通过,单号【"+emisWaybillAjustApply.getBillCode()+"】"; - sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "d24/orderManagement/UserOrderList"); + sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); // 审核通过 return emisWaybillAjustApplyMapper.auditCenterPass(emisWaybillAjustApply); @@ -264,7 +266,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode()); String title="费用调整审批拒绝,单号【"+emisWaybillAjustApply.getBillCode()+"】"; - sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "d24/orderManagement/UserOrderList"); + sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); return emisWaybillAjustApplyMapper.auditCenterNoPass(emisWaybillAjustApply); }