From d0d243dda631c23df34458d944c51fff28cdd26d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 18 Jun 2025 15:46:29 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java | 12 +++++++++---
 .../xdadan/erp/emis/service/IEmisWaybillService.java |  2 +-
 .../impl/EmisWaybillAjustApplyServiceImpl.java       |  2 +-
 .../emis/service/impl/EmisWaybillServiceImpl.java    |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 193ac6d2a..4fcc47597 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1626,7 +1626,7 @@ public class EmisBaseService {
          if(!CollectionUtil.isEmpty(list)){
              for(EmisWaybill dt:list){
                  try {
-                    redoGenerateBill(dt.getBillCode());
+                    redoGenerateBill(dt.getBillCode(),false);
                  }catch (Exception ex){
                      ex.printStackTrace();
                  }
@@ -1751,8 +1751,14 @@ public class EmisBaseService {
      }
 
 
+     /**
+      * 运单出账
+      * @param billCode
+      * @param isForce  -- 是否强制出账
+      * @throws EmisBizError
+      */
      @Transactional
-     public void redoGenerateBill(String billCode) throws EmisBizError{
+     public void redoGenerateBill(String billCode,Boolean isForce) throws EmisBizError{
          log.info("===>Start 运单出账:"+billCode);
 
             boolean isNewBill=true;
@@ -1770,7 +1776,7 @@ public class EmisBaseService {
 
                  isNewBill=false;
                  for (EmisSettleSubBill oldBill:oldSubBillList) {
-                     if ("1".equals(oldBill.getBlConfirmCenter())) {
+                     if ("1".equals(oldBill.getBlConfirmCenter()) && !isForce) {
                          log.info("===>账单财务确认不允许出账！");
                          return;
                      }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index 023557730..faae8d221 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -161,7 +161,7 @@ public interface IEmisWaybillService extends IDataAuditService
     * @param emisWaybillSave
     * @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 ;
 
 
 
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 808fd3d2d..b234415d7 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
@@ -345,7 +345,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
                 "费用调整已审批通过-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
         );
 
-        emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave,false);
+        emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave,false,true);
 
         String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】";
         sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList");
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 0df86280e..df71c2927 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -3538,7 +3538,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @throws EmisBizError
      */
     @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());
@@ -3624,7 +3624,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 运单修改需要重新出账
         try {
             // 判断是否需要重新出账
-            redoGenerateBill(emisWaybillSave.getBillCode());
+            redoGenerateBill(emisWaybillSave.getBillCode(),isForce);
 
             // 重新计算提成
             emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());