From 256e7acf0c7a54a416cc2d2be5fb6d4d0e0e8dcb Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Sat, 5 Jul 2025 17:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=A8=8E=E7=8E=87=E7=BC=96=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/management/controller/PastContractController.java | 4 ++-- src/main/java/com/management/controller/XSHTController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/management/controller/PastContractController.java b/src/main/java/com/management/controller/PastContractController.java index c64da38..3672ae7 100644 --- a/src/main/java/com/management/controller/PastContractController.java +++ b/src/main/java/com/management/controller/PastContractController.java @@ -423,8 +423,8 @@ public class PastContractController { //contractDetailMap.put("baseqty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量 contractDetailMap.put("qty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量 contractDetailMap.put("priceandtax", contractDetailData.getBigDecimal("sales_price") != null ? contractDetailData.getBigDecimal("sales_price") : 0);//含税单价 - //contractDetailMap.put("taxrateid_number", contractDetailData.getBigDecimal("tax_rate__c") != null ? contractDetailData.getBigDecimal("tax_rate__c") : 0);//税率 - contractDetailMap.put("taxrateid_number", "V13");//税率 + contractDetailMap.put("taxrateid_number", contractDetailData.getString("tax_rate_code__c") != null ? contractDetailData.getString("tax_rate_code__c") : "");//税率 + //contractDetailMap.put("taxrateid_number", "V13");//税率 contractDetailMap.put("curamountandtax", contractDetailData.getBigDecimal("subtotal") != null ? contractDetailData.getBigDecimal("subtotal") : 0);//价税合计 //contractDetailMap.put("curtaxamount", contractDetailData.getBigDecimal("tax_amount__c") != null ? contractDetailData.getBigDecimal("tax_amount__c") : 0);//金额 contractDetailMap.put("crmentryid", contractDetailData.getString("_id"));//明细id diff --git a/src/main/java/com/management/controller/XSHTController.java b/src/main/java/com/management/controller/XSHTController.java index 3aea688..1965c3f 100644 --- a/src/main/java/com/management/controller/XSHTController.java +++ b/src/main/java/com/management/controller/XSHTController.java @@ -411,8 +411,8 @@ public class XSHTController { //contractDetailMap.put("baseqty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量 contractDetailMap.put("qty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量 contractDetailMap.put("priceandtax", contractDetailData.getBigDecimal("sales_price") != null ? contractDetailData.getBigDecimal("sales_price") : 0);//含税单价 - //contractDetailMap.put("taxrateid_number", contractDetailData.getBigDecimal("tax_rate__c") != null ? contractDetailData.getBigDecimal("tax_rate__c") : 0);//税率 - contractDetailMap.put("taxrateid_number", "V13");//税率 + contractDetailMap.put("taxrateid_number", contractDetailData.getString("tax_rate_code__c") != null ? contractDetailData.getString("tax_rate_code__c") : "");//税率 + //contractDetailMap.put("taxrateid_number", "V13");//税率 contractDetailMap.put("curamountandtax", contractDetailData.getBigDecimal("subtotal") != null ? contractDetailData.getBigDecimal("subtotal") : 0);//价税合计 //contractDetailMap.put("curtaxamount", contractDetailData.getBigDecimal("tax_amount__c") != null ? contractDetailData.getBigDecimal("tax_amount__c") : 0);//金额 contractDetailMap.put("crmentryid", contractDetailData.getString("_id"));//明细id