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 f49ef654a..e9a5f7f5e 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 @@ -133,7 +133,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements checkFirstSigningDay(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply)); // 检查月结/现金客户额度 - checkUseQuotaCredit(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply)); +// checkUseQuotaCredit(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply)); // 插入数据 emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply); @@ -344,7 +344,11 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements "费用调整已审批通过-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]" ); - emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave,false,true); + if(isDZZS) { + emisWaybillService.reUpdateWayBill(emisWaybillOld, emisWaybillSave, false, true); + }else{ + emisWaybillService.reUpdateWayBill(emisWaybillOld, emisWaybillSave, false, false); + } String title="费用调整已审批通过,单号【"+emisWaybillAjustApply.getBillCode()+"】"; sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList");