From 55b5de1d9965fbeda8623f9e4b5fcf72af85e284 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 6 Jun 2023 10:46:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/controller/BaseInvoiceController.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index c5127580..245fdb05 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -919,13 +919,13 @@ public class BaseInvoiceController extends AbstractController {
     @ResponseBody
     public Object afterInTellingCheck(@RequestBody Map<String, Object> map) {
 
-        String isChooseAll = (String) map.get("isChooseAll");
-
-        if (StringUtils.isBlank(isChooseAll)){
-            isChooseAll = "Y";
-        }
+//        String isChooseAll = (String) map.get("isChooseAll");
+//
+//        if (StringUtils.isBlank(isChooseAll)){
+//            isChooseAll = "Y";
+//        }
 
-        map.put("isChooseAll",isChooseAll);
+        map.put("isChooseAll","Y");
         int curr = 1;
         int size = 10;
         int count = 0;

From 406327842406ad54763b93098d868e857ae011f0 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 6 Jun 2023 11:14:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E9=AA=8C=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=8B=86=E5=88=86=E5=85=A8=E7=94=B5=E5=8F=B7?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=B9=B6=E6=9C=AAele=5Finvoice=5Fno=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/impl/SignSaveInvoiceInfoServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 6d577742..3cd86292 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
@@ -468,11 +468,11 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
 
         invoice.setInvoiceType(invoiceType);
         if (FplxEnum.QDZZP.getFplxDm().equals(invoiceType) || FplxEnum.QDPP.getFplxDm().equals(invoiceType)) {
-            invoice.setInvoiceNo(uuid);
-        } else {
-            invoice.setInvoiceCode(invoiceCode);
-            invoice.setInvoiceNo(invoiceNo);
+            invoice.setEleInvoiceNo(uuid);
         }
+        invoice.setInvoiceCode(invoiceCode);
+        invoice.setInvoiceNo(invoiceNo);
+
         invoice.setUuid(uuid);
         if ("1".equals(queryInvoiceResult.getString("state"))) {
             invoice.setInvoiceStatus(FpztEnum.ZF.getFpztDm(FpztEnum.ZF.getIndex()));