Merge remote-tracking branch 'origin/test' into test

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;

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()));