From 27ea8d5ffac8aeefac20bbd7bb0edc2486629918 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 18 May 2023 14:20:16 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=8F=91=E7=A5=A8=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E7=9F=BF=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/consumer/utils/BeanTransitionUtils.java | 2 +- .../module/invoice/model/excel/ExportInvoiceItemInfo.java | 3 ++- .../invoice/model/excel/ExportInvoiceItemInfoEnum.java | 8 ++++++-- .../invoice/service/impl/OrderInvoiceInfoServiceImpl.java | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index d7896c1a..cbd2dfb1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3537,7 +3537,7 @@ public class BeanTransitionUtils { } } catch (IOException e) { //编码格式错误 - log.error("处理商品名称异常", e); + log.error("处理商品名称异常：{}", e); throw new RuntimeException(e); } } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java index 35faec93..558fa6fb 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java @@ -50,6 +50,7 @@ public class ExportInvoiceItemInfo implements Serializable { * 商品编码 */ private String spbm; - + private String kb; + } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java index 833270a2..771ad519 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java @@ -48,8 +48,12 @@ public enum ExportInvoiceItemInfoEnum { EXCEL_EXPORT_INVOICE_SL("30", "sl", "税率"), EXCEL_EXPORT_INVOICE_SE("31", "se", "税额"), EXCEL_EXPORT_INVOICE_SPBM("32", "spbm", "税收分类编码"), - EXCEL_EXPORT_INVOICE_BMBBBH("33", "bmbbbh", "编码表版本号"), - EXCEL_EXPORT_INVOICE_ITEM("34", "exportInvoiceItemInfoList", "数组"); + EXCEL_EXPORT_INVOICE_KB("33", "kb", "矿别"), + EXCEL_EXPORT_INVOICE_BMBBBH("34", "bmbbbh", "编码表版本号"), + EXCEL_EXPORT_INVOICE_ITEM("35", "exportInvoiceItemInfoList", "数组") + + + ; /** * key diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java index 04de7d46..ffbe8e45 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java @@ -664,6 +664,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { exportInvoiceItemInfo.setSl(StringUtils.isNotBlank(orderItemInfo.getSl()) ? orderItemInfo.getSl() : ""); exportInvoiceItemInfo.setSe(StringUtils.isNotBlank(orderItemInfo.getSe()) ? orderItemInfo.getSe() : ""); exportInvoiceItemInfo.setSpbm(StringUtils.isNotBlank(orderItemInfo.getSpbm()) ? orderItemInfo.getSpbm() : ""); + exportInvoiceItemInfo.setKb(StringUtils.isNotBlank(orderItemInfo.getKb()) ? orderItemInfo.getKb() : ""); exportInvoiceItemInfoList.add(exportInvoiceItemInfo); }