From ede492b7b021c28d220efa9bba0d3f8e7ffaad66 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 3 May 2023 10:09:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/erp/service/SNPushCheckRecordService.java   |  1 +
 .../service/impl/SignSaveInvoiceInfoServiceImpl.java | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
index 979f455a..65278b6a 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@@ -483,6 +483,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                         snDetailMap.put("commodityName", detail.getString("hwmc"));
                         snDetailMap.put("specificationModel", detail.getString("ggxh"));
                         snDetailMap.put("unit", detail.getString("jldw"));
+                        snDetailMap.put("detailNo",detail.getString("mxbh"));
                         String quantity = detail.getString("spsl");
 //                        if (quantity.length() > 3) {
 //                            int index = quantity.indexOf(".");
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 cef73746..f1e19343 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
@@ -308,19 +308,19 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                     invoiceDetail.setNum(invoiceDetailQuery.getString("quantity"));
                     invoiceDetail.setGoodsName(invoiceDetailQuery.getString("commodityName"));
                     invoiceDetail.setUnitPrice(invoiceDetailQuery.getString("unitPrice"));
-                    invoiceDetail.setDetailAmount(invoiceDetailQuery.getString("detailAmount"));
+                    invoiceDetail.setDetailAmount(invoiceDetailQuery.getString("amount"));
                     invoiceDetail.setTaxRate(invoiceDetailQuery.getString("taxRate"));
                     if(invoiceDetailQuery.getString("taxRate") != null){
                         invoiceDetail.setTaxCode(getZSM(invoiceDetailQuery.getString("taxRate")));
                     }
 
-                    invoiceDetail.setTaxAmount(invoiceDetailQuery.getString("taxAmount"));
+                    invoiceDetail.setTaxAmount(invoiceDetailQuery.getString("tax"));
                     if (FplxEnum.TXF.getFplxDm().equals(invoiceType)) {
                         // 通行费发票
-                        invoiceDetail.setCph(invoiceDetailQuery.getString("cph"));
-                        invoiceDetail.setLx(invoiceDetailQuery.getString("lx"));
-                        invoiceDetail.setTxrqq(invoiceDetailQuery.getString("txrqq"));
-                        invoiceDetail.setTxrqz(invoiceDetailQuery.getString("txrqz"));
+                        invoiceDetail.setCph(invoiceDetailQuery.getString("licensePlateNum"));
+                        invoiceDetail.setLx(invoiceDetailQuery.getString("type"));
+                        invoiceDetail.setTxrqq(invoiceDetailQuery.getString("currentDateStart"));
+                        invoiceDetail.setTxrqz(invoiceDetailQuery.getString("currentDateEnd"));
                     }
                     invoiceDetailList.add(invoiceDetail);
                 }