ariesy 全电发票发票号码补全

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -389,10 +389,10 @@ public class SDNYMainProcessController extends AbstractController {
 
         if("31".equals(invoiceType) || "32".equals(invoiceType) || "185".equals(invoiceType) || "186".equals(invoiceType)){
             checkInvoice.put("invoiceCode", "");
-            checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
+            checkInvoice.put("invoiceNumber", invoiceCode == null ? checkInvoice.get("invoiceNo").toString() :invoiceCode + checkInvoice.get("invoiceNo").toString());
         }else {
             checkInvoice.put("invoiceCode", invoiceCode);
-            checkInvoice.put("invoiceNumber", invoiceCode == null ? checkInvoice.get("invoiceNo").toString() :invoiceCode + checkInvoice.get("invoiceNo").toString());
+            checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
         }
         String uuid = "";
         if (invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)) {
@@ -450,7 +450,7 @@ public class SDNYMainProcessController extends AbstractController {
                 if (detail.getString("detailAmount") != null && detail.getString("taxAmount") != null) {
                     Float je = Float.parseFloat(detail.getString("detailAmount"));
                     if(detail.getString("taxAmount") != null) {
-                        Float se = Float.parseFloat(detail.getString("se"));
+                        Float se = Float.parseFloat(detail.getString("taxAmount"));
                         hjje = je + se;
                     }else{
                         hjje = je;