From 0869dc54767605f9cde35938914554db66b1d131 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 12 May 2023 17:24:22 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BF=AE=E6=94=B9=E8=A1=A5?= =?UTF-8?q?=E5=85=A8=E5=85=AC=E5=8F=B8=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GenerateReadyOpenOrderServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 7a3eba24..4d941b1d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -654,8 +654,17 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setOriginDdh(orderInfo.getDdh()); if(StrUtil.isNotBlank(commonOrderInfo.getOrderInfo().getYfpHm())){ OrderInvoiceInfo orderInvoiceInfoY = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(commonOrderInfo.getOrderInfo().getYfpDm(), commonOrderInfo.getOrderInfo().getYfpHm(), null); - OrderProcessInfo orderProcessInfoY = orderProcessInfoMapper.selectOrderProcessInfoByProcessId(orderInvoiceInfoY.getOrderProcessInfoId(), null); - orderProcessInfo.setGsdm(orderProcessInfoY.getGsdm()); + //判断不在系统开的发票 + if(orderInvoiceInfoY != null && StringUtils.isNotBlank(orderInvoiceInfoY.getOrderProcessInfoId())){ + OrderProcessInfo orderProcessInfoY = orderProcessInfoMapper.selectOrderProcessInfoByProcessId(orderInvoiceInfoY.getOrderProcessInfoId(), null); + orderProcessInfo.setGsdm(orderProcessInfoY.getGsdm()); + }else { + DeptEntity department = userInfoService.getDepartment(); + if(department != null && StringUtils.isNotBlank(department.getEnterpriseNumbers())){ + String numbers = department.getEnterpriseNumbers(); + orderProcessInfo.setGsdm(numbers); + } + } } if(StrUtil.isBlank(orderProcessInfo.getGsdm())){ orderProcessInfo.setGsdm(orderInfo.getGsdm());