diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index e55db0580..8b9bbe6cf 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -869,8 +869,6 @@ public class EmisCommonController extends EmisBaseController } - - /** * 单独出账 * @return 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 b234415d7..62ff8250a 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 @@ -231,11 +231,8 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements emisWaybillAjustApply.setDestConfirmNote(inputObj.getDestConfirmNote()); emisWaybillAjustApply.setDestConfirmManCode(getCurrentUser().getEmpCode()); - emisWaybillAjustApplyMapper.auditDestNoPass(emisWaybillAjustApply); - - return 1; } @@ -394,14 +391,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements EmisSettleBill oldSettleBill = emisSettleBillService.selectEmisSettleBillBySettleBillNo(oldSubBill.getSettleBillNo()); if (oldSettleBill != null) { // 触发业务账单自动确认 - EmisSettleBill emisSettleBill = new EmisSettleBill(); - emisSettleBill.setConfirmSiteManCode(emisWaybillAjustApply.getApplyManCode()); - emisSettleBill.setConfirmSiteCode(emisWaybillAjustApply.getApplySiteCode()); - emisSettleBill.setBlConfirmSite("1"); - emisSettleBill.setConfirmSiteDate(new Date()); - emisSettleBill.setId(oldSettleBill.getId()); - emisSettleBill.setConfirmSiteNote("[单证专属]申请调整费用-自动确认"); - emisSettleBillService.updateEmisSettleBill(emisSettleBill); +// EmisSettleBill emisSettleBill = new EmisSettleBill(); +// emisSettleBill.setConfirmSiteManCode(emisWaybillAjustApply.getApplyManCode()); +// emisSettleBill.setConfirmSiteCode(emisWaybillAjustApply.getApplySiteCode()); +// emisSettleBill.setBlConfirmSite("1"); +// emisSettleBill.setConfirmSiteDate(new Date()); +// emisSettleBill.setId(oldSettleBill.getId()); +// emisSettleBill.setConfirmSiteNote("[单证专属]申请调整费用-自动确认"); +// emisSettleBillService.updateEmisSettleBill(emisSettleBill); // 重新计算账单费用,计算开票状态,计算收款状态 emisSettleBillService.reCalcSettleBillFee(oldSettleBill);