Merge branch 'release' of http://192.168.12.182/invoice/pt into 0507

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"))) {