From 306a45983b6d6f4417b675de64f98058d19a9bfe Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 17 May 2023 11:26:21 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=91=E7=A5=A8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SignSaveInvoiceInfoServiceImpl.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
index 3eb3191c..4041a0f9 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
@@ -474,12 +474,16 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
             invoice.setInvoiceNo(invoiceNo);
         }
         invoice.setUuid(uuid);
-        if ("Y".equals(queryInvoiceResult.getString("isCancelled"))) {
+        if ("1".equals(queryInvoiceResult.getString("state"))) {
             invoice.setInvoiceStatus(FpztEnum.ZF.getFpztDm(FpztEnum.ZF.getIndex()));
-        } else if ("N".equals(queryInvoiceResult.getString("isCancelled"))) {
+        } else if ("0".equals(queryInvoiceResult.getString("state"))) {
             invoice.setInvoiceStatus(FpztEnum.ZC.getFpztDm(FpztEnum.ZC.getIndex()));
+        }else if ("2".equals(queryInvoiceResult.getString("state"))) {
+            invoice.setInvoiceStatus(FpztEnum.HC.getFpztDm(FpztEnum.HC.getIndex()));
+        }else if ("3".equals(queryInvoiceResult.getString("state"))) {
+            invoice.setInvoiceStatus(FpztEnum.SK.getFpztDm(FpztEnum.SK.getIndex()));
         } else {
-            invoice.setInvoiceStatus(queryInvoiceResult.getString("isCancelled"));
+            invoice.setInvoiceStatus(FpztEnum.YC.getFpztDm(FpztEnum.YC.getIndex()));
         }
 
         if (queryInvoiceResult.getString("totalAmount") != null && StringUtils.isNoneBlank(queryInvoiceResult.getString("totalAmount"))) {