feature 1.发票明细导出增加矿别

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);
                     }
                 }

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;
+
     
 }

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

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);
                 }