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 15:46:29 +08:00
parent 3b35c592bf
commit d0d243dda6
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1626,7 +1626,7 @@ public class EmisBaseService {
if(!CollectionUtil.isEmpty(list)){ if(!CollectionUtil.isEmpty(list)){
for(EmisWaybill dt:list){ for(EmisWaybill dt:list){
try { try {
redoGenerateBill(dt.getBillCode()); redoGenerateBill(dt.getBillCode(),false);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
} }
@ -1751,8 +1751,14 @@ public class EmisBaseService {
} }
/**
* 运单出账
* @param billCode
* @param isForce -- 是否强制出账
* @throws EmisBizError
*/
@Transactional @Transactional
public void redoGenerateBill(String billCode) throws EmisBizError{ public void redoGenerateBill(String billCode,Boolean isForce) throws EmisBizError{
log.info("===>Start 运单出账:"+billCode); log.info("===>Start 运单出账:"+billCode);
boolean isNewBill=true; boolean isNewBill=true;
@ -1770,7 +1776,7 @@ public class EmisBaseService {
isNewBill=false; isNewBill=false;
for (EmisSettleSubBill oldBill:oldSubBillList) { for (EmisSettleSubBill oldBill:oldSubBillList) {
if ("1".equals(oldBill.getBlConfirmCenter())) { if ("1".equals(oldBill.getBlConfirmCenter()) && !isForce) {
log.info("===>账单财务确认不允许出账！"); log.info("===>账单财务确认不允许出账！");
return; return;
} }

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
View File

@ -161,7 +161,7 @@ public interface IEmisWaybillService extends IDataAuditService
* @param emisWaybillSave * @param emisWaybillSave
* @throws EmisBizError * @throws EmisBizError
*/ */
public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,boolean needUpdateAttach) throws EmisBizError ; public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,Boolean needUpdateAttach,Boolean isForce) throws EmisBizError ;

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

@ -345,7 +345,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
"费用调整已审批通过-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]" "费用调整已审批通过-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
); );
emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave,false); emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave,false,true);
String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】"; String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】";
sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList");

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -3538,7 +3538,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
* @throws EmisBizError * @throws EmisBizError
*/ */
@Override @Override
public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,boolean needUpdateAttach) throws EmisBizError { public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,Boolean needUpdateAttach,Boolean isForce) throws EmisBizError {
// 公共计算部分 // 公共计算部分
emisWaybillSave.setId(oldEmisWaybill.getId()); emisWaybillSave.setId(oldEmisWaybill.getId());
@ -3624,7 +3624,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 运单修改需要重新出账 // 运单修改需要重新出账
try { try {
// 判断是否需要重新出账 // 判断是否需要重新出账
redoGenerateBill(emisWaybillSave.getBillCode()); redoGenerateBill(emisWaybillSave.getBillCode(),isForce);
// 重新计算提成 // 重新计算提成
emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());