From 7ddadbd494e87c74f6783e25d019429e5460b57f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 7 Jul 2024 18:42:16 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java  | 2 ++
 .../emis/service/impl/EmisWaybillAjustApplyServiceImpl.java | 6 ++++++
 .../src/main/resources/mapper/EmisSettleSubBillMapper.xml   | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
index 9c4708ecf..c86501be9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
@@ -84,4 +84,6 @@ public class EmisSettleSubBill extends BaseEntity
     //   扩展参数
     private EmisWaybill waybillDetail;
 
+
+
 }
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 9f9d6dbee..5fdeb8aa5 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
@@ -178,6 +178,12 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         emisWaybillAjustApply.setBlCenterConfirmed("1");
         emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode());
 
+        // 获取账单状态，若账单处于非未确认状态，不允许审核
+        EmisSettleSubBill emisSettleSubBill=getSettleSubBillByBillCode(emisWaybillAjustApply.getBillCode());
+        if("1".equals(emisSettleSubBill.getBlConfirm())){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"财务账单已确认，请先取消确认！");
+        }
+
         // 运单更新
         JSONObject jsonObject = JSONObject.parseObject(emisWaybillAjustApply.getJsonData());
         JSONObject newValueJObj=jsonObject.getJSONObject("newValue");
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index d4ceef6d9..fdbf05eef 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -28,6 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="siteConfirmDate"    column="site_confirm_date"    />
         <result property="siteConfirmManCode"    column="site_confirm_man_code"    />
         <result property="siteConfirmNote"    column="site_confirm_note"    />
+
+
     </resultMap>
 
     <resultMap id="EmisSettleSubBillResult" type="EmisSettleSubBill" extends="BaseEmisSettleSubBillResult"  >