aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-06-18 16:11:45 +08:00
parent 61a9da48fd
commit a5c02922fc
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -869,8 +869,6 @@ public class EmisCommonController extends EmisBaseController
} }
/** /**
* 单独出账 * 单独出账
* @return * @return

19
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -231,11 +231,8 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
emisWaybillAjustApply.setDestConfirmNote(inputObj.getDestConfirmNote()); emisWaybillAjustApply.setDestConfirmNote(inputObj.getDestConfirmNote());
emisWaybillAjustApply.setDestConfirmManCode(getCurrentUser().getEmpCode()); emisWaybillAjustApply.setDestConfirmManCode(getCurrentUser().getEmpCode());
emisWaybillAjustApplyMapper.auditDestNoPass(emisWaybillAjustApply); emisWaybillAjustApplyMapper.auditDestNoPass(emisWaybillAjustApply);
return 1; return 1;
} }
@ -394,14 +391,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
EmisSettleBill oldSettleBill = emisSettleBillService.selectEmisSettleBillBySettleBillNo(oldSubBill.getSettleBillNo()); EmisSettleBill oldSettleBill = emisSettleBillService.selectEmisSettleBillBySettleBillNo(oldSubBill.getSettleBillNo());
if (oldSettleBill != null) { if (oldSettleBill != null) {
// 触发业务账单自动确认 // 触发业务账单自动确认
EmisSettleBill emisSettleBill = new EmisSettleBill(); // EmisSettleBill emisSettleBill = new EmisSettleBill();
emisSettleBill.setConfirmSiteManCode(emisWaybillAjustApply.getApplyManCode()); // emisSettleBill.setConfirmSiteManCode(emisWaybillAjustApply.getApplyManCode());
emisSettleBill.setConfirmSiteCode(emisWaybillAjustApply.getApplySiteCode()); // emisSettleBill.setConfirmSiteCode(emisWaybillAjustApply.getApplySiteCode());
emisSettleBill.setBlConfirmSite("1"); // emisSettleBill.setBlConfirmSite("1");
emisSettleBill.setConfirmSiteDate(new Date()); // emisSettleBill.setConfirmSiteDate(new Date());
emisSettleBill.setId(oldSettleBill.getId()); // emisSettleBill.setId(oldSettleBill.getId());
emisSettleBill.setConfirmSiteNote("[单证专属]申请调整费用-自动确认"); // emisSettleBill.setConfirmSiteNote("[单证专属]申请调整费用-自动确认");
emisSettleBillService.updateEmisSettleBill(emisSettleBill); // emisSettleBillService.updateEmisSettleBill(emisSettleBill);
// 重新计算账单费用,计算开票状态,计算收款状态 // 重新计算账单费用,计算开票状态,计算收款状态
emisSettleBillService.reCalcSettleBillFee(oldSettleBill); emisSettleBillService.reCalcSettleBillFee(oldSettleBill);