From 69485420a1a7b1cb669f397f656addcb25e85e39 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 19:18:16 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=90=8E=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderCommonServiceImpl.java | 1 + .../invoice/service/impl/OrderInvoiceInfoServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+) 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));