From 7ba834da0f4baf512e0640a716b0d4a5ffe6bb7d Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 20 Jan 2025 16:43:51 +0800 Subject: [PATCH] md --- .../xdadan/erp/web/emis/EmisCustomerAddressController.java | 2 +- .../emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java | 4 +++- .../emis/service/impl/EmisWaybillAjustApplyServiceImpl.java | 2 +- emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java index 5d3ff0440..a17a78170 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java @@ -140,7 +140,7 @@ public class EmisCustomerAddressController extends EmisBaseController return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); } - @Log(title = "客户收寄件地址", businessType = BusinessType.UPDATE) + @Log(title = "更新客户收寄件地址", businessType = BusinessType.UPDATE) @PostMapping("/editAddress") public AjaxResult editAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) { 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 92941f8bc..2b990b952 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 @@ -188,7 +188,9 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen String empName=getCurrentUser().getEmpName(); String title=empName+"提交了开票申请,开票抬头："+emisSettleInvoiceRecord.getCompanyName()+",开票金额:"+emisSettleInvoiceRecord.getApplyMoney()+",请及时开票！"; - sendNoticeToEmpUser("88888042,88888047,88888034", title, "", "/ruyERj/CenterInvoiceRecordDeal"); + +// 财务说不需要提醒 +// sendNoticeToEmpUser("88888042,88888047,88888034", title, "", "/ruyERj/CenterInvoiceRecordDeal"); return 1; } 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 fca05473b..5d82ca286 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 @@ -98,7 +98,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements SysUser sysUser=getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode()); String title=sysUser.getEmpName()+"提交了运单费用调整申请,请及时审批，单号【"+emisWaybillAjustApply.getBillCode()+"】"; - sendNoticeToEmpUser("88888042,88888047,88888034,88888059,88888083", title, "", "/d24/expenseRecognitionManagemen/WaybillAjustCenterConfirm"); +// sendNoticeToEmpUser("88888042,88888047,88888034,88888059,88888083", title, "", "/d24/expenseRecognitionManagemen/WaybillAjustCenterConfirm"); return 1; } diff --git a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml index 68e394ea3..68f54cda9 100644 --- a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml @@ -215,7 +215,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} -