From 6f184e5acdd39b3e8f71d71f6d42298b40d4eec4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 14 Aug 2024 19:13:58 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisSettleSubBillController.java | 15 +++++++++++++++
 .../xdadan/erp/emis/service/EmisBaseService.java  |  8 ++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
index 93b26966b..f173ecba6 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
@@ -442,6 +442,21 @@ public class EmisSettleSubBillController extends EmisBaseController
             for(int i=0;i<ids.length;i++){
                 try {
                     long id=ids[i];
+
+                    // 如果财务已确认，则不允许不出账
+                    EmisSettleSubBill oldSubBill = emisSettleSubBillService.selectEmisSettleSubBillById(id);
+                    if(oldSubBill==null){
+                        return AjaxResult.error("账单不存在!");
+                    }
+
+                    if("1".equals(oldSubBill.getBlConfirmCenter())){
+                        return AjaxResult.error("财务已确认!");
+                    }
+
+                    // 如果已合账，也不允许不出账
+
+
+
                     EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
                     emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode());
                     emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode());
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 a39c626e3..c7fb56aa1 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
@@ -1152,6 +1152,7 @@ public class EmisBaseService {
                  // 旧账单，只允许调整
                  emisSettleSubBill.setId(oldSubBillList.get(0).getId());
                  emisSettleSubBillMapper.updateEmisSettleSubBill(emisSettleSubBill);
+
              }
 
              // 新费用
@@ -1316,7 +1317,6 @@ public class EmisBaseService {
 
          }
 
-
          log.error("===>End 运单出账");
      }
 
@@ -2512,7 +2512,11 @@ public class EmisBaseService {
          EmisRegion emisRegion = new EmisRegion();
          emisRegion.setRegionName(name);
          emisRegion.setParentCode(parentCode);
-         emisRegion.setCountryCode(countryCode);
+
+         // 非身份则需要判断国家
+         if(StringUtils.isEmpty(parentCode)){
+            emisRegion.setCountryCode(countryCode);
+         }
          List<EmisRegion> list=emisRegionMapper.selectEmisRegionList(emisRegion);
          if(!CollectionUtils.isEmpty(list)) {
              return list.get(0);