diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java index 6391fd65..4b05edbe 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java @@ -1258,6 +1258,7 @@ public class OrderCommonServiceImpl implements OrderCommonService { orderProcessInfo.setOriginDdh(processInfo.getDdh()); orderProcessInfo.setOriginOrderId(processInfo.getOrderInfoId()); orderProcessInfo.setKb(processInfo.getKb()); + orderProcessInfo.setEntId(processInfo.getEntId()); return orderProcessInfo; } 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 d10c78d0..f6f32a01 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 @@ -196,6 +196,12 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { OrderInvoiceInfo oderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); if (oderInvoiceInfo != null) { OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList); + if(StringUtils.isNotBlank(oderInvoiceInfo.getFpqqlsh())){ + OrderProcessInfo processInfo = orderInfoMapper.selectProcessByFpqqlsh(oderInvoiceInfo.getFpqqlsh(), shList); + if(processInfo != null){ + orderInfo.setYhbh(processInfo.getYhbh()); + } + } List list = orderItemInfoMapper.selectOrderItemInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList); co.setOrderInvoiceInfo(oderInvoiceInfo); co.setOrderItemList(JsonUtils.getInstance().listBeanCopy(list, OrderItemInfo.class));