diff --git a/order-management-common/src/main/java/com/dxhy/order/model/page/OrderInvoiceInfoVo.java b/order-management-common/src/main/java/com/dxhy/order/model/page/OrderInvoiceInfoVo.java index 4470e316..c3c65dc8 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/page/OrderInvoiceInfoVo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/page/OrderInvoiceInfoVo.java @@ -107,6 +107,7 @@ public class OrderInvoiceInfoVo { * 系统来源 */ private String xtly; + private String fjh; /** * 数据权限ID */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index dadf645e..6640ce9a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -1661,8 +1661,10 @@ public class InvoiceServiceImpl implements InvoiceService { BigDecimal blueSe = blueItemList.stream().map(blueItem -> new BigDecimal(blueItem.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal hjzje = blueMxje.add(blueSe); if(OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(blueInvoiceInfo.getFpzlDm())){ + SpecialInvoiceReversalPlus specialInvoiceReversal = new SpecialInvoiceReversalPlus(); BeanUtils.copyProperties(blueInvoiceInfo,specialInvoiceReversal); + specialInvoiceReversal.setFjh(blueInvoiceInfo.getFjh()); specialInvoiceReversal.setYfpHm(blueInvoiceInfo.getFphm()); specialInvoiceReversal.setYfpDm(blueInvoiceInfo.getFpdm()); specialInvoiceReversal.setYfpKprq(blueInvoiceInfo.getKprq()); diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml index b1a832b9..b4e08629 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml @@ -245,6 +245,7 @@ + @@ -2313,6 +2314,7 @@ oii.zf_bz, oii.ch_bz, oii.kprq, + oii.fjh, op.ddzt FROM order_invoice_info oii INNER JOIN order_process_info op ON oii.order_info_id = op.order_info_id