From 3d68f32a571b520b47040cd4a3c8f6c5c9586cd2 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 15 May 2023 16:38:32 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=BA=95=E8=B4=A6?= =?UTF-8?q?=E5=BA=93=E5=B7=B2=E6=9C=89=E6=95=B0=E6=8D=AE=20=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=8C=E5=AD=97=E6=AE=B5=E8=B5=8B=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 16 ++++++++++------ .../impl/SignSaveInvoiceInfoServiceImpl.java | 2 +- 2 files changed, 11 insertions(+), 7 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 f1c163c4..ddac6f3d 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 @@ -193,10 +193,10 @@ public class SDNYMainProcessController extends AbstractController { String invoiceNo = checkInvoiceByUuid.getInvoiceNo(); QueryWrapper detailWrapper = new QueryWrapper<>(); detailWrapper.eq("invoice_no", invoiceNo); - DynamicContextHolder.push(DbConstant.DETAIL_READ); + DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); List baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); - DynamicContextHolder.push(DbConstant.BUSINESS_READ); + DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(checkInvoiceByUuid); JSONArray checkInvoiceDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail); @@ -443,16 +443,20 @@ public class SDNYMainProcessController extends AbstractController { //如果是卷票计算合计金额 Float hjje = null; if (detail.getString("detailAmount") != null && detail.getString("taxAmount") != null) { - Float je = Float.parseFloat(detail.getString("je")); - Float se = Float.parseFloat(detail.getString("se")); - hjje = je + se; + Float je = Float.parseFloat(detail.getString("detailAmount")); + if(detail.getString("taxAmount") != null) { + Float se = Float.parseFloat(detail.getString("se")); + hjje = je + se; + }else{ + hjje = je; + } } if (hjje != null) snDetailMap.put("amount", hjje.toString()); } else { - snDetailMap.put("tax", "***".equals(detail.getString("amount")) ? "0.00" : detail.getString("se")); + snDetailMap.put("tax", "***".equals(detail.getString("taxAmount")) ? "0.00" : detail.getString("taxAmount")); snDetailMap.put("amount", detail.getString("detailAmount")); } 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 987e032f..3eb3191c 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 @@ -288,7 +288,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl invoiceDetailList = new ArrayList<>(dataArray.size()); for (int i = 0; i < dataArray.size(); i++) { JSONObject invoiceDetailQuery = dataArray.getJSONObject(i);