From 4130d300d727a753f1108a390c46fabf361b24cf Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 16 May 2023 10:05:34 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=85=A8=E7=94=B5=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=8F=B7=E7=A0=81=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index e7bcc8e8..bd41225e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/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;